[Lunar-commits] <moonbase-other> opencv: Fixing the DEPENDS and adjusting the BUILD for tbb.
stumbles
stumbles at lunar-linux.org
Tue Dec 11 13:37:01 CET 2012
commit 27f60e63d2ef283f4bc9167305f08827d0a18a7e
Author: stumbles <stumbles at lunar-linux.org>
Date: Tue, 11 Dec 2012 04:37:01 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/27f60e63d2ef283f4bc9167305f08827d0a18a7e
opencv: Fixing the DEPENDS and adjusting the BUILD for tbb.
---
libs/opencv/BUILD | +4/-0
libs/opencv/DEPENDS | +4/-4
2 files changed, 8 insertions(+), 4 deletions(-)
--- a/libs/opencv/BUILD
+++ b/libs/opencv/BUILD
@@ -1,5 +1,9 @@
(
+ if in_depends $MODUE tbb ; then
+ OPTS+=" -DTBB_LIB_DIR=/usr/lib"
+ fi &&
+
patch_it $SOURCE_CACHE/$SOURCE2 1 &&
default_cmake_build &&
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -19,15 +19,15 @@ optional_depends jasper "-DWITH_JASPER=ON" \
"for JPEG-2000 Part-1 support"
optional_depends %JPEG "-DWITH_JPEG=ON" \
- "-DWITH_JPEG=OFF \
+ "-DWITH_JPEG=OFF" \
"for jpeg graphics support"
-optional_depends qt4 "-DWITH_QT=ON WITH_QT_OPENGL=ON" \
- "-DWITH_QT=OFF WITH_QT_OPENGL=OFF" \
+optional_depends qt4 "-DWITH_QT=ON" \
+ "-DWITH_QT=OFF" \
"Build with Qt Backend support"
optional_depends tiff "-DWITH_TIFF=ON" \
- "-DWITH_TIFF=OFF \
+ "-DWITH_TIFF=OFF" \
"for tiff graphics support"
optional_depends ffmpeg "-DWITH_FFMPEG=ON" \
More information about the Lunar-commits
mailing list