move to master branch for GUI, SMESH, PARAVIS and PARAVISADDONS since dedicated ParaV...

[tools/sat_salome.git] / applications / SALOME-master-native.pyconf

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 2556f4f0fa508d7f91b8169d2a82de59bf74175c..e7dd64d6786fad9f9255b857e198f1f61d6be96c 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -44,7 +44,7 @@ APPLICATION :
         cgns : '4.2.0'
         chardet : 'native'
         click : 'native'
-        cmake : 'native'
+        cmake : '3.24.2'
         cppunit : 'native'
         cminpack: '1.3.6'
         cycler : 'native'
@@ -145,9 +145,9 @@ APPLICATION :
         'LIBBATCH' : {tag : 'V2_4_6'}
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'GUI' : 'po/pv-master'
+        'GUI'
         'GEOM'
-        'SMESH' : 'po/pv-master'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -159,7 +159,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS': {tag:'agy/pv-master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -175,7 +175,7 @@ APPLICATION :
         'PY2CPP'
         'ADAO'
         'ADAO_INTERFACE'
-        'PARAVISADDONS' : 'po/pv-master'
+        'PARAVISADDONS'
         'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
@@ -221,6 +221,7 @@ __overwrite__ :
     {
         #
         __condition__ : "VARS.dist in ['UB22.04']"
+        'APPLICATION.products.cmake'       : 'native' # TTK requires cmake > 3.21
         'APPLICATION.products.opencv'      : '3.2.0'
         'APPLICATION.products.nlopt'       : '2.5.0'
         'APPLICATION.products.cminpack'    : 'native'
@@ -239,8 +240,7 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.cmake': '3.24.2'
-        'APPLICATION.products.opencv': '3.2.0'
+        'APPLICATION.products.opencv'  : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'   : {tag:'2.6',        base: 'no',  section: 'version_2_6_no_pip'             }
         'APPLICATION.products.qt'      : '5.12.10'
@@ -251,8 +251,8 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['DB11']"
-        'APPLICATION.products.opencv' : '3.2.0'
-        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.opencv'           : '3.2.0'
+        'APPLICATION.products.cminpack'         : 'native'
         'APPLICATION.products.PyFMI'            : {tag:'2.6',    base: 'no',  section: 'version_2_6_no_pip' }
         'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_DB11'}
     }
@@ -289,12 +289,13 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD36']"
-        'APPLICATION.products.opencv'      : '3.2.0'
-        'APPLICATION.products.omniORB'     : '4.2.5'
-        'APPLICATION.products.omniORBpy'   : '4.2.5'
-        'APPLICATION.products.qwt'         : '6.1.6'
-        'APPLICATION.products.nlopt'       : '2.6.0'
-        'APPLICATION.products.netcdf'      : '4.6.2'
+        'APPLICATION.products.cmake'            : 'native' # TTK requires cmake > 3.21
+        'APPLICATION.products.opencv'           : {tag: '3.2.0',   base: 'no', section: 'version_3_2_0_FD36'}
+        'APPLICATION.products.omniORB'          : '4.2.5'
+        'APPLICATION.products.omniORBpy'        : '4.2.5'
+        'APPLICATION.products.qwt'              : '6.1.6'
+        'APPLICATION.products.nlopt'            : '2.6.0'
+        'APPLICATION.products.netcdf'           : '4.6.2'
         'APPLICATION.products.numpy'            : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'                      }
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_no_pip'                  }
         'APPLICATION.products.root'             : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_FD36'                }