From a589ff9d232b617aeeff4bab56d3c08a7d8e60e3 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 10 Mar 2023 12:34:27 +0100
Subject: [PATCH] COTECH 148 decisions:    1- openMPI 4.1.5    2- cmake 3.25.2 
   3- swig 4.1.1 if swig installed version less than 4.0

---
 applications/SALOME-master-MPI.pyconf     | 6 +++---
 applications/SALOME-master-int32.pyconf   | 6 +++---
 applications/SALOME-master-native.pyconf  | 5 ++++-
 applications/SALOME-master-windows.pyconf | 6 ++----
 applications/SALOME-master.pyconf         | 6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 45e689e..cd75b07 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -44,7 +44,7 @@ APPLICATION :
         cgns : {tag : '4.2.0', hpc : 'yes'}
         chardet : '3.0.4'
         click : '6.7'
-        cmake : '3.24.2'
+        cmake : '3.25.2'
         cminpack: '1.3.6'
         cppunit : '1.13.2'
         cycler : '0.10.0'
@@ -91,7 +91,7 @@ APPLICATION :
         omniORB : '4.2.5'
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
-        openmpi : '3.1.6'
+        openmpi : '4.1.5'
         openturns:  {tag : '1.19', hpc : 'yes'}
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -129,7 +129,7 @@ APPLICATION :
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
         statsmodels: '0.8.0'
-        swig : '3.0.12'
+        swig : '4.1.1'
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index 042766d..e07fad7 100644
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -43,7 +43,7 @@ APPLICATION :
         cgns : '4.2.0'
         chardet : '3.0.4'
         click : '6.7'
-        cmake : '3.24.2'
+        cmake : '3.25.2'
         cminpack: '1.3.6'
         cppunit : '1.13.2'
         cycler : '0.10.0'
@@ -90,7 +90,7 @@ APPLICATION :
         omniORB : '4.2.5'
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
-        openmpi : '3.1.6'
+        openmpi : '4.1.5'
         openturns: '1.19'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -128,7 +128,7 @@ APPLICATION :
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
         statsmodels: '0.8.0'
-        swig : '3.0.12'
+        swig : '4.1.1'
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 6cdedd2..ca60ac2 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -44,7 +44,7 @@ APPLICATION :
         cgns : '4.2.0'
         chardet : 'native'
         click : 'native'
-        cmake : '3.24.2'
+        cmake : '3.25.2'
         cppunit : 'native'
         cminpack: '1.3.6'
         cycler : 'native'
@@ -244,6 +244,8 @@ __overwrite__ :
         'APPLICATION.products.sip'      : '5.5.0'
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no',  section: 'version_5_11_0_MPI_DB10', hpc: 'yes'}
         '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.1.1'
+        'APPLICATION.products.openmpi'  : '4.1.5'
     }
     {
         __condition__ : "VARS.dist in ['DB11']"
@@ -260,6 +262,7 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',    base: 'no', section: 'version_2_6_no_pip'     }
         'APPLICATION.products.statsmodels'      : {tag: '0.6.1',  base: 'no', section: 'version_0_6_1_no_pip'   }
         'APPLICATION.products.gdal'             : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'      } # spns #29324
+        'APPLICATION.products.swig'             : '4.1.1'
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 76df6a2..7b57387 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -44,7 +44,7 @@ APPLICATION :
         cgns : '4.2.0'
         chardet : '3.0.4'
         click : '7.0'
-        cmake : '3.24.2'
+        cmake : '3.25.2'
         colorama: '0.4.1'
         cppunit : '1.13.2'
         cycler : '0.10.0'
@@ -123,12 +123,10 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.2'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '2.0.0'
-        StaticMeshPlugin: '5.11.0'
-        swig : '3.0.12'
+        swig : '4.1.1'
         tbb : '2019_U8_win'
         toml : '0.10.2'
         tcltk : '8.6.9'
-        ##TTK : 'f8dafde2d7'
         urllib3 : '1.25.3'
         zlib : '1.2.5'
 
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5e51f85..7483eab 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -44,7 +44,7 @@ APPLICATION :
         cgns : '4.2.0'
         chardet : '3.0.4'
         click : '6.7'
-        cmake : '3.24.2'
+        cmake : '3.25.2'
         cminpack: '1.3.6'
         cppunit : '1.13.2'
         cycler : '0.10.0'
@@ -91,7 +91,7 @@ APPLICATION :
         omniORB : '4.2.5'
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
-        openmpi : '3.1.6'
+        openmpi : '4.1.5'
         openturns: '1.19'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -129,7 +129,7 @@ APPLICATION :
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
         statsmodels: '0.8.0'
-        swig : '3.0.12'
+        swig : '4.1.1'
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-- 
2.39.2