SOLVERLAB DB11 compliance

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 5d4dcfbab265ff0e074dfd6b61702b105d06f109..05d0b926922e03023093731c6306986f55b9d8ab 100644 (file)
--- 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 c116a0c489669ceaab85e0efe7b7dd5e5e676f73..ba498d5181d19de751695950665b1c3a42d0e35a 100644 (file)
--- 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 a03b23ff0ccb927024b80986615b33ddbec098af..7a2d5695a7cd13e89de661e066b4cfb596647f01 100644 (file)
--- 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 (file)
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)