[Lunar-commits] <moonbase> opencv: Adding a couple of optional_depends and adjusting the BUILD

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sun Dec 25 03:41:37 CET 2011


commit 7682b01ac9780a95fa4e16b9f2766a41da0f843f
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sat Dec 24 21:41:37 2011 -0500

    opencv: Adding a couple of optional_depends and adjusting the BUILD
    
    since it does not install all the binaries.
---
 libs/opencv/BUILD   |    5 ++++-
 libs/opencv/DEPENDS |   12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libs/opencv/BUILD b/libs/opencv/BUILD
index bd4c265..e13b814 100644
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,5 +1,8 @@
 (
 
-  default_cmake_build
+  default_cmake_build &&
+
+# It doesn't install these binaries
+  install bin/opencv_test* /usr/bin
 
 ) > $C_FIFO 2>&1
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index 232d3dc..bb30c8f 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -6,8 +6,8 @@ optional_depends gtk+-2       "-DWITH_GTK=ON"     \
                               "-DWITH_GTK=OFF"    \
                               "for gtk+-2 graphics support"
 
-optional_depends eigen2       "-DWITH_EIGEN2=ON"    \
-                              "-DWITH_EIGEN2=OFF"   \
+optional_depends eigen2       "-DWITH_EIGEN=ON"    \
+                              "-DWITH_EIGEN=OFF"   \
                               "for linear algebra libraries support"
 
 optional_depends jasper       "-DWITH_JASPER=ON"   \
@@ -54,3 +54,11 @@ optional_depends "openexr"    "-DWITH_OPENEXR=ON"     \
                               "-DWITH_OPENEXR=OFF"    \
                               "for IML support"
 
+optional_depends "tbb"        "-DWITH_TBB=ON"      \
+                              "-DWITH_TBB=OFF"     \
+                              "for threaded building block support"
+
+optional_depends "CUDA-OpenCL-headers" "-DWITH_CUDA=ON"    \
+                                       "-DWITH_CUDA=OFF"    \
+                                       "for NVidia Cuda Runtime support"
+


More information about the Lunar-commits mailing list