spns #29880 : UB22.04 support: opencv - omniORB

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

diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index eae07ad5082834a206dee9b6dff343a1a0b2a72d..2663e1962e9a025ef469bb3d2d8be962bc078c54 100755 (executable)
--- a/products/compil_scripts/opencv.sh
+++ b/products/compil_scripts/opencv.sh
@@ -28,10 +28,14 @@ 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
+
+    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}"
-        fi
+           ;;
+    esac
     CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
     # 
 else
@@ -50,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 ]