X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-9.8.0-native.pyconf;h=dedd8434637f35ed2f4300ed6a83e046c11d7c2b;hb=18bc5ccaefd4b32de6ec98b7d6575e18a4993f04;hp=6aa87537e0cf10aff810913f3205676b058be9cd;hpb=8a6b4ed5dede4beb188e5a9237e3dc55c8401dbd;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 6aa8753..dedd843 100644
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -191,17 +191,13 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
-        # deeper investigations need to be done in its sources. Use embedded openCV product where
-        # native one is 4.X.
-        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']"
-        'APPLICATION.products.opencv' : '3.2.0'
-    }
     {
         #
-        __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
-       'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'}
+        __condition__ : "VARS.dist in ['UB20.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.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4'}
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -211,35 +207,40 @@ __overwrite__ :
         # As this version is compliant too, let's force it as the new minimum needed version.
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'}
+        'APPLICATION.products.cminpack' : 'native'
+        'APPLICATION.products.PyFMI'    : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'}
+    }
+    {
+        __condition__ : "VARS.dist in ['DB11']"
+        '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.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11'}
     }
     {
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
         # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base : 'no', section : 'version_0_9_10_no_pip'}
-        'APPLICATION.products.cmake' : '3.12.1'
+        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'}
+        'APPLICATION.products.cminpack'    : '1.3.6'
+        'APPLICATION.products.PyFMI'       : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'   }
+        'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' }
+        'APPLICATION.products.ParaView'    : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_CO8'    }
+    }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        'APPLICATION.products.opencv'    : '3.2.0'
+        'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'}
+        'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32' }
+        'APPLICATION.products.ParaView'  : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'}
     }
     {
         # FD 34 qt5 package is qt5-qtbase-devel.
         __condition__ : "VARS.dist in ['FD34']"
+        'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
-        'APPLICATION.products.PyFMI'    : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'}
-        'APPLICATION.products.root'     : {tag:'6.22.02', base : 'no', section : 'version_6_22_02_FD34'}
-    }
-    {
-        __condition__ : "VARS.dist in ['FD32']"
-        'APPLICATION.products.PyFMI'    : {tag:'2.5', base:  'no', section : 'version_2_5_no_pip'}
-    }
-    {
-        __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
-        'APPLICATION.products.cminpack': 'native'
-        'APPLICATION.products.PyFMI'    : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
-    }
-    {
-        __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.cminpack'    : '1.3.6'
-        'APPLICATION.products.PyFMI'       : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
-        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section : 'version_0_6_1_no_pip'}
+        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
+        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
     }
 ]