Changeset 29124 for gs3-extensions/openCV/trunk/src/packages/CASCADE-MAKE/OPENCV.sh

Timestamp:

2014-07-09T10:46:30+12:00 (10 years ago)

Author:

jmt12

Message:

Added code to try and prevent OpenCV recompiling if it is already compiled... but it doesn't seem to work. At least it avoids running cmake each time

File:

• gs3-extensions/openCV/trunk/src/packages/CASCADE-MAKE/OPENCV.sh (modified) (5 diffs)

gs3-extensions/openCV/trunk/src/packages/CASCADE-MAKE/OPENCV.sh

@@ -2 +2 @@
 
 package=OpenCV
-version=-2.4.3
+version=-2.4.9
 
 progname=$0
@@ -17 +17 @@
 #echo GSDLOS = $GSDLOS
 
+opt_run_untar $force_untar $auto_untar $package $version
+
 # Whether force_config is set for this package depends on CMake test
 # to see if 'release' directory has been created or no
 if [ $auto_config = "1" ] ; then
-  if [ ! -d $package$version/release ; then
+  if [ ! -d $package$version/release ] ; then
     force_config=1
   fi
 fi
 
-opt_run_untar $force_untar $auto_untar $package $version .tar.bz2
+if type -p opencv_createsamples; then
+  echo "found opencv in PATH"
+  _OPENCV=opencv_createsamples
+elif [[ -x "$GEXTOPENCV_INSTALLED/linux/bin/opencv_createsamples" ]]; then
+  echo "found opencv in openCV/linux/bin"
+  _OPENCV="$GEXTOPENCV_INSTALLED/linux/bin/opencv_createsamples"
+fi
 
 if [ $force_config = "1" ] ; then
@@ -35 +43 @@
     fi ; \
     cd release ; \
-    cmake -D CMAKE_BUILD_TYPE=RELEASE \
-          -D CMAKE_INSTALL_PREFIX=$prefix \
-          -D BUILD_PYTHON_SUPPORT=OFF ..;
-    PKG_CONFIG_PATH=$prefix/lib/pkgconfig:${PKG_CONFIG_PATH};
-    export PKG_CONFIG_PATH;
+
+    if [ ! -f Makefile ] ; then \
+      cmake -D CMAKE_BUILD_TYPE=RELEASE \
+            -D CMAKE_INSTALL_PREFIX=$prefix ..;
+    fi ; \
+    PKG_CONFIG_PATH=$prefix/lib/pkgconfig:${PKG_CONFIG_PATH}; \
+    export PKG_CONFIG_PATH; \
    )
   if [ $? != 0 ] ; then
@@ -46 +56 @@
   fi
   echo "[popd]"
+  opt_run_cmake $compile $package $version "release"
+  opt_run_cmake $install $package $version "release" "install"
 else
   if [ $auto_config = "1" ] ; then
@@ -52 +64 @@
 fi
 
-opt_run_cmake $compile $package $version "release"
-opt_run_cmake $install $package $version "release" "install"
 opt_run_cmake $clean $package $version "release" "clean"
 opt_run_cmake $distclean $package $version "release" "distclean"