From 95330b70a3714da23cb0f5aa69bbb73b4054ad8f Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 2 Feb 2024 15:45:58 +0100 Subject: [PATCH] =?utf8?q?[CEA=2040693]=20COTECH=20156.5:=20Check=20usage?= =?utf8?q?=20of=20C++17=20as=20default=20standard=20for=20SALOME=E2=80=99s?= =?utf8?q?=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- applications/SALOME-master-native.pyconf | 8 +++++--- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7e53340..4f05311 100644 --- 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 d996341..ccf8d94 100644 --- 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 d9695d6..09315c7 100644 --- 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']" -- 2.39.2