From 762e6fbbae19ce6d365fba4feec52877753daffd Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 5 Feb 2024 14:01:18 +0100 Subject: [PATCH] [CEA 40693] COTECH 156.5: move back to standard c++11 - until moving to vs-2022 --- applications/SALOME-master-native.pyconf | 6 +----- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 4f05311..d85494a 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': 'bos/40807' + 'CONFIGURATION' 'SALOME' 'SHAPER' 'SHAPERSTUDY' @@ -247,7 +247,6 @@ __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'} } { @@ -255,7 +254,6 @@ __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.CONFIGURATION' : 'master' 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} } { @@ -270,7 +268,6 @@ __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. @@ -351,7 +348,6 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD37' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD37' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD37', 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 ccf8d94..d996341 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' : 'bos/40807' + 'CONFIGURATION' 'SALOME' 'SHAPER' 'SHAPERSTUDY' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 09315c7..5177285 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -141,7 +141,7 @@ APPLICATION : URANIE : '4.7.0' # SALOME MODULES : - 'CONFIGURATION': 'bos/40807' + 'CONFIGURATION' 'SALOME' 'SHAPER' 'SHAPERSTUDY' @@ -241,7 +241,6 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } '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