[Lunar-commits] <moonbase-other> opencv: Adjusting the BUILD, the if statement is not needed. Instead it needs

stumbles stumbles at lunar-linux.org
Tue Jul 30 02:16:22 CEST 2013


commit 45e61bdfaabb76e8869eafe45886a8fcc0646315
Author: stumbles <stumbles at lunar-linux.org>
Date: Mon, 29 Jul 2013 17:14:53 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/45e61bdfaabb76e8869eafe45886a8fcc0646315

opencv: Adjusting the BUILD, the if statement is not needed. Instead it needs

the addition of -DBUILD_TBB=ON to the tbb optional_depends.
---
  libs/opencv/BUILD   | +0/-4     
  libs/opencv/DEPENDS | +1/-1     
  2 files changed, 1 insertion(+), 5 deletions(-)

--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,10 +1,6 @@
 
   patch_it $SOURCE2 1 &&
 
-  if in_depends $MODUE tbb ; then
-    OPTS+=" -DTBB_LIB_DIR=/usr/lib"
-  fi &&
-
   default_cmake_build &&
 
 # It doesn't install these binaries
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -58,7 +58,7 @@ optional_depends "openexr"    "-DWITH_OPENEXR=ON"     \
                               "-DWITH_OPENEXR=OFF"    \
                               "for IML support"
 
-optional_depends "tbb"        "-DWITH_TBB=ON"      \
+optional_depends "tbb"        "-DWITH_TBB=ON -DBUILD_TBB=ON"      \
                               "-DWITH_TBB=OFF"     \
                               "for threaded building block support"
 




More information about the Lunar-commits mailing list