From 7512be6ec3c8ec8d637c1a9154bc2a133fce371d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 6 Mar 2024 16:56:40 +0100 Subject: [PATCH] [CEA 40693] COTECH 156.5: Check usage of C++14 as default standard for SALOME modules --- applications/SALOME-master-native.pyconf | 5 ++++- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 9dbd810..13dce95 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' @@ -235,6 +235,7 @@ __overwrite__ : # - Qt minimal version 5.12 # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" + 'APPLICATION.products.CONFIGURATION' : 'master' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.hdf5' : 'native' @@ -251,6 +252,7 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB11']" + 'APPLICATION.products.CONFIGURATION' : 'master' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.hdf5' : 'native' 'APPLICATION.products.cminpack' : 'native' @@ -259,6 +261,7 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB12']" + 'APPLICATION.products.CONFIGURATION' : 'master' 'APPLICATION.rm_products' : ['root', 'URANIE'] 'APPLICATION.products.cmake' : 'native' # TTK requires cmake > 3.21 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_DB12'} 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 5177285..5780542 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' -- 2.39.2