summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-06-29 12:01:05 +0200
committerLudovic Courtès <ludo@gnu.org>2016-06-29 12:01:05 +0200
commitbc3a2e3503b5bc18d988b3cd516bea0f91237384 (patch)
tree26348dfe7ba0141e81ce996a82a9ca6c6efa4226 /gnu
parent53d159f8434360d4ff2e379676c2098553b96bf7 (diff)
downloadguix-bc3a2e3503b5bc18d988b3cd516bea0f91237384.tar.gz
gnu: ceres-solver: Depend on glog.
* gnu/packages/maths.scm (ceres)[arguments]: Remove -DMINIGLOG=ON.
[inputs]: Add GLOG.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/maths.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 3b860a957f..4be534274a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages less)
   #:use-module (gnu packages lisp)
+  #:use-module (gnu packages logging)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)
@@ -644,10 +645,7 @@ interfaces.")
     (build-system cmake-build-system)
     (arguments
      ;; TODO: Build HTML user documentation and install separately.
-     ;; XXX: Use the embedded "miniglog" as a replacement for
-     ;; <https://github.com/google/glog>.  TODO: Use Glog when it's available.
-     '(#:configure-flags '("-DMINIGLOG=ON"
-                           "-DBUILD_EXAMPLES=OFF"
+     '(#:configure-flags '("-DBUILD_EXAMPLES=OFF"
                            "-DBUILD_SHARED_LIBS=ON")
 
        #:phases (modify-phases %standard-phases
@@ -665,6 +663,7 @@ interfaces.")
        ("blas" ,openblas)
        ("lapack" ,lapack)
        ("suitesparse" ,suitesparse)
+       ("glog" ,glog)
        ("gflags" ,gflags)))
     (synopsis "C++ library for solving large optimization problems")
     (description