From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 6 Dec 2022 11:32:33 +0000 (+0100)
Subject: Use OPENTURNS_SALOME V9_10_0rc1 tag + switch on GMSH export CGNS and ensure that... 
X-Git-Tag: V9_11_0~163
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=263e7ea2b6a1088b966da9f89e324800576f3480;p=tools%2Fsat_salome.git

Use OPENTURNS_SALOME V9_10_0rc1 tag + switch on GMSH export CGNS and ensure that on Fedora 34, lib is used instead of lib64 for PERSALYS tests
---

diff --git a/applications/SALOME-9.10.0-native.pyconf b/applications/SALOME-9.10.0-native.pyconf
index 88901ac..d8965e3 100644
--- a/applications/SALOME-9.10.0-native.pyconf
+++ b/applications/SALOME-9.10.0-native.pyconf
@@ -176,7 +176,7 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'OPENTURNS_SALOME' : 'master'
+        'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
         'SOLVERLAB'
diff --git a/applications/SALOME-9.10.0.pyconf b/applications/SALOME-9.10.0.pyconf
index 4186d11..82431e5 100644
--- a/applications/SALOME-9.10.0.pyconf
+++ b/applications/SALOME-9.10.0.pyconf
@@ -179,7 +179,7 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'OPENTURNS_SALOME':  'master'
+        'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
         'SOLVERLAB' : {tag:'V9_10_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'}
diff --git a/products/compil_scripts/PERSALYS-v13.0.sh b/products/compil_scripts/PERSALYS-v13.0.sh
index b035551..187dcbf 100755
--- a/products/compil_scripts/PERSALYS-v13.0.sh
+++ b/products/compil_scripts/PERSALYS-v13.0.sh
@@ -106,6 +106,20 @@ then
     exit 3
 fi
 
+# spns #32377
+#  setting -DCMAKE_INSTALL_LIBDIR to lib is not enough on Fedora nodes
+echo
+echo "*** check installation"
+if [! -d "${PRODUCT_INSTALL}/lib" ]; then
+    mkdir -p ${PRODUCT_INSTALL}/lib
+fi
+
+if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
+    echo "WARNING: moving lib64 to lib"
+    mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib/
+    rmdir ${PRODUCT_INSTALL}/lib64
+fi
+
 echo
 echo "########## END"
 
diff --git a/products/compil_scripts/gmsh-4.10.3.bat b/products/compil_scripts/gmsh-4.10.3.bat
index 6fab1b6..b02b880 100644
--- a/products/compil_scripts/gmsh-4.10.3.bat
+++ b/products/compil_scripts/gmsh-4.10.3.bat
@@ -35,7 +35,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ONELAB_METAMODEL=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PARSER=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PETSC=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PRIVATE_API=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_OPENMP=OFF
diff --git a/products/compil_scripts/gmsh-4.10.3.sh b/products/compil_scripts/gmsh-4.10.3.sh
index d5aa9e6..493d3a5 100755
--- a/products/compil_scripts/gmsh-4.10.3.sh
+++ b/products/compil_scripts/gmsh-4.10.3.sh
@@ -24,7 +24,7 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_ONELAB_METAMODEL=OFF"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PARSER=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PETSC=OFF"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PRIVATE_API=ON"
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF" # default value is set to ON in release 4.1.4
+CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_LIBDIR=${PRODUCT_INSTALL}/lib" # strangely on Ubuntu GMSH installs the .so in lib instead of lib/lib64 - so force to lib64
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_PREFIX_PATH=${LAPACK_ROOT_DIR};${HDF5_ROOT_DIR};${MEDFILE_ROOT_DIR};" # set path of third libraries to our associated internal products
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_OPENMP=ON"     # get OpenMP based parallelism working