move back to master branches

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

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 74ceb9a11fb48a97132fa740b375fbb1b2a6a537..3d91d891f3d12219866dc4cfc0881917a4c7c6b1 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -132,7 +132,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        TopIIVolMesh: 'develop'
+        TopIIVolMesh
         urllib3 : 'native'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -160,8 +160,8 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'OPENTURNS_SALOME'
+        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -261,4 +261,9 @@ __overwrite__ :
         'APPLICATION.products.root'      : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'           }
         'APPLICATION.products.gdal'      : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD34'             } # spns #29324
     }
+    {
+        # FIXME: to be removed once CEA License for 2.14-4 is renewed.
+        __condition__ : "VARS.dist not in ['DB09', 'DB10', 'DB11']"
+        'APPLICATION.products.MeshGems' : '2.13-1'
+    }
 ]