[CEA 40693] COTECH 156.5: Check usage of C++17 as default standard for SALOME’s modules

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 7e53340796380c0eb68c53b85e57c62aed650cec..4f053117c43d7ff8ed23d8eaaed80239324a315a 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -138,7 +138,7 @@ APPLICATION :
         URANIE : '4.7.0'
 
         # SALOME MODULES :
-        'CONFIGURATION'
+        'CONFIGURATION': 'bos/40807'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'
@@ -247,6 +247,7 @@ __overwrite__ :
         'APPLICATION.products.scipy'    : {tag: '1.5.2',  base: 'no', section: 'version_1_5_2_no_pip'                }  # scipy >= 1.4 - system one too old
         'APPLICATION.products.swig'     : '4.0.2'
         'APPLICATION.products.openmpi'  : '4.1.5'
+        'APPLICATION.products.CONFIGURATION' : 'master'
         'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
     }
     {
@@ -254,7 +255,8 @@ __overwrite__ :
         '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.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'APPLICATION.products.CONFIGURATION'    : 'master'
+        'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB12']"
@@ -268,6 +270,7 @@ __overwrite__ :
         'APPLICATION.products.nlopt'            : '2.5.0'
         'APPLICATION.products.openturns'        : {tag: '1.21',  base: 'no', section: 'version_1_21_DB12'        }
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_DB12', hpc: 'yes' }
+        'APPLICATION.products.CONFIGURATION'    : 'master'
     }
     {
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
@@ -368,7 +371,6 @@ __overwrite__ :
         'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                    }
         'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_FD38'                 }
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
-        'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
         'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                 hpc: 'no'  }
     }
 ]

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index d996341103275edc6e1991b273fe934ca42ed582..ccf8d9482c4ea5b29013c399594c33b4e8cf40fa 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -141,7 +141,7 @@ APPLICATION :
         zlib : '1.2.5'
 
         # SALOME MODULES :
-        'CONFIGURATION'
+        'CONFIGURATION' : 'bos/40807'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index d9695d67212c6896b72ccdc2dd9749152f44289d..09315c774bef0fff78d8700145db1016aa3e55b3 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -141,7 +141,7 @@ APPLICATION :
         URANIE : '4.7.0'
 
         # SALOME MODULES :
-        'CONFIGURATION'
+        'CONFIGURATION': 'bos/40807'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'
@@ -240,7 +240,8 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['DB09']"
         'APPLICATION.products.openturns'        : {tag: '1.21',  base: 'no', section: 'version_1_21_DB09' }
-        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'APPLICATION.products.CONFIGURATION'    : 'master'
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"