From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 17 Aug 2022 12:50:00 +0000 (+0200)
Subject: spns #29880 :  UB22.04 support: opencv - omniORB
X-Git-Tag: V9_11_0~345
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=928fdcb49cba2b3aa5e3ebf8c8e85e673ea7ab65;p=tools%2Fsat_salome.git

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

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index df8fc04..cd63f81 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -213,6 +213,17 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'   : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'           }
         'APPLICATION.products.netcdf'  : '4.6.2'
     }
+    {
+        #
+        __condition__ : "VARS.dist in ['UB22.04']"
+        'APPLICATION.products.opencv'  : '3.2.0'
+        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.PyFMI'   : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'           }
+        'APPLICATION.products.netcdf'  : '4.6.2'
+        'APPLICATION.rm_products'      : ['mesa']
+        'APPLICATION.products.omniORB'   : '4.2.5'
+        'APPLICATION.products.omniORBpy' : '4.2.5'
+    }
     {
         # DB10:
         #   - Qt minimal version 5.12
diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index c4198f1..2663e19 100755
--- 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