move back to master branch for SMESH since TopIIVol plugin developments are OK

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ee3ec37977eae07f11c97663d65f514d7c09c0e5..fb9064247982a2d1068bb1d3bda97127fb87013c 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -148,7 +148,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -235,7 +235,6 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.SMESH' :  'master'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                  }

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 077dcdeaf4fd394b93ee881236916214af958f4c..eaba41128aa0d03d1d35832e5958c235f1d13a41 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -143,7 +143,7 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 7096b38dbc1573d7610e4d15aaed0ed15c69de84..e1e5d3d1a82b7c946a69f2dcc09a1461a7762d02 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -150,7 +150,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : 'cbr/improve_topiivol_layout'
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -228,13 +228,8 @@ __overwrite__ :
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
-    {
-        __condition__ : "VARS.dist in ['DB09']"
-        'APPLICATION.products.SMESH' :  'master'
-    }
     {
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.SMESH' :  'master'
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }