From 17b1d0bd85158eedf62f057696ad0d26a4da2a5a Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Sat, 1 Jan 2022 13:36:47 +0100 Subject: [PATCH] SOLVERLAB DB11 compliance --- applications/SALOME-9.8.0-native.pyconf | 3 ++- applications/SALOME-master-native.pyconf | 1 + products/SOLVERLAB.pyconf | 6 ++++++ products/patches/SOLVERLAB-DB11.patch | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 products/patches/SOLVERLAB-DB11.patch diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index 5d4dcfb..05d0b92 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -238,7 +238,8 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB11']" - 'APPLICATION.products.CONFIGURATION' : {tag:'master', base : 'no', section : 'default_DB11'} + 'APPLICATION.products.CONFIGURATION' : {tag:'V9_8_0', base : 'no', section : 'default_DB11'} + 'APPLICATION.products.SOLVERLAB' : {tag:'V9_8_0', base : 'no', section : 'default_DB11'} } { __condition__ : "VARS.dist in ['CO8']" diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index c116a0c..ba498d5 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -239,6 +239,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['DB11']" 'APPLICATION.products.CONFIGURATION' : {tag:'master', base : 'no', section : 'default_DB11'} + 'APPLICATION.products.SOLVERLAB' : {tag:'master', base : 'no', section : 'default_DB11'} } { __condition__ : "VARS.dist in ['CO8']" diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf index a03b23f..7a2d569 100644 --- a/products/SOLVERLAB.pyconf +++ b/products/SOLVERLAB.pyconf @@ -38,6 +38,7 @@ default : incremental : "yes" has_salome_gui : "yes" } + patches : [] } default_MPI : @@ -58,3 +59,8 @@ default_MPI : ] opt_depend : ['mpi4py'] } + +default_DB11 : +{ + patches : ['SOLVERLAB-DB11.patch'] +} diff --git a/products/patches/SOLVERLAB-DB11.patch b/products/patches/SOLVERLAB-DB11.patch new file mode 100644 index 0000000..c67d3ea --- /dev/null +++ b/products/patches/SOLVERLAB-DB11.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c50d414..6f95188 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 3.1) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + ++IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18) ++ CMAKE_POLICY(SET CMP0057 NEW) ++ENDIF() ++ + # Project name + project (SOLVERLAB C CXX) + set (SOLVERLAB_VERSION_MAJOR 9) -- 2.39.2