Fix path to mpicc and mpicxx

[tools/sat_salome.git] / products / compil_scripts / opencv.sh

diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index b5ac5e94689af534627858dbd08bfb12c4cc44b7..c4198f1c35e76960edc4e1f5b3c6b2aeaa368ad8 100755 (executable)
--- a/products/compil_scripts/opencv.sh
+++ b/products/compil_scripts/opencv.sh
@@ -5,7 +5,7 @@ echo "opencv" $VERSION
 echo "##########################################################################"
 
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-
+CPPSTD="\"-std=c++14\""
 CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
@@ -14,7 +14,7 @@ if version_ge $VERSION "3."; then
     echo "*** openCV version $VERSION >= 3."
     CMAKE_OPTIONS+=" -DBUILD_NEW_PYTHON_SUPPORT=ON"
     CMAKE_OPTIONS+=" -DBUILD_EXAMPLES:BOOL=ON"
-    CMAKE_OPTIONS+=" -DPYTHON3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+    CMAKE_OPTIONS+=" -DPYTHON3_EXECUTABLE=${PYTHONBIN}"
     CMAKE_OPTIONS+=" -DPYTHON3_NUMPY_INCLUDE_DIRS=${NUMPY_INCLUDE_DIR};${NUMPY_INCLUDE_DIR2}"
     CMAKE_OPTIONS+=" -DWITH_IPP:BOOL=OFF"
     CMAKE_OPTIONS+=" -DBUILD_opencv_java:BOOL=OFF"
@@ -28,7 +28,11 @@ if version_ge $VERSION "3."; then
     CMAKE_OPTIONS+=" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
     CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
-
+    if [[ $DIST_NAME == "FD" && $DIST_VERSION == "34" ]]
+        then
+            CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=${CPPSTD}"
+        fi
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
     # 
 else
     echo "*** openCV version $VERSION < 3."
@@ -46,6 +50,7 @@ rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 
+echo "*** cmake $CMAKE_OPTIONS $SOURCE_DIR"
 cmake $CMAKE_OPTIONS $SOURCE_DIR
 
 if [ $? -ne 0 ]