spns #32377: switch off CGNS support for GMSH until issue fixed

[tools/sat_salome.git] / products / compil_scripts / ParaView-5.10.0.sh

diff --git a/products/compil_scripts/ParaView-5.10.0.sh b/products/compil_scripts/ParaView-5.10.0.sh
index f782c2ddda2334abbaffd81b63b5de4a02e44034..006acc2f9a11ede843aafe332549de3f31986aa2 100755 (executable)
--- a/products/compil_scripts/ParaView-5.10.0.sh
+++ b/products/compil_scripts/ParaView-5.10.0.sh
@@ -116,8 +116,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES"
@@ -217,14 +217,14 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON"
 
 # Openturns:
-if [ -n "$OPENTURNS_VERSION" ]; then
+if [ -n "$OT_VERSION" ]; then
     function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
-    if version_ge $OPENTURNS_VERSION "1.17" ; then
-        echo "INFO: Adding OpenTURNS version ${OPENTURNS_VERSION} support..."
+    if version_ge $OT_VERSION "1.17" ; then
+        echo "INFO: Adding OpenTURNS version ${OT_VERSION} support..."
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_OPENTURNS=ON"
-        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OPENTURNS_ROOT_DIR/lib/cmake/openturns"
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns"
     else
-        echo "WARNING: OpenTURNS ${OPENTURNS_VERSON} is not supported with current ParaView build..."
+        echo "WARNING: OpenTURNS ${OT_VERSON} is not supported with current ParaView build..."
     fi
 else
     echo "WARNING: No OpenTURNS environment variable is found..."