X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fopencv.sh;h=2663e1962e9a025ef469bb3d2d8be962bc078c54;hb=928fdcb49cba2b3aa5e3ebf8c8e85e673ea7ab65;hp=b5ac5e94689af534627858dbd08bfb12c4cc44b7;hpb=81312c5ebcba0f4e03e4dfe58ce54efd706dc40b;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index b5ac5e9..2663e19 100755
--- 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"
@@ -29,6 +29,14 @@ if version_ge $VERSION "3."; then
     CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
     CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
 
+    LINUX_DIST="$DIST_NAME$DIST_VERSION"
+    LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+    case $LINUX_DISTRIBUTION in
+	FD34|FD35|FD36|UB22*)
+            CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=${CPPSTD}"
+	    ;;
+    esac
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
     # 
 else
     echo "*** openCV version $VERSION < 3."
@@ -46,6 +54,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 ]