variables automatically detected in environment

diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index bdaf75650a3a443cca848106f48ca32739ce2a75..c17e3f91323527f41da598694a85453098c06c2c 100755 (executable)
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -8,31 +8,36 @@ echo "##########################################################################
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_EXECUTABLE=${PYTHONBIN}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT=${HDF5_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_ROOT_DIR=${MEDFILE_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ROOT_DIR=${PARAVIEW_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPETSC_DIR=${PETSC_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGUI_ROOT_DIR=${GUI_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 
-# GUI was ported after 9.6.0
 if [ $VERSION == "V9_6_0" ]
 then
+    # GUI was ported after 9.6.0
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCOREFLOWS_WITH_GUI=OFF"
+    # following variables are automatically detected in environment after 9.6.0
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT=${HDF5_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_ROOT_DIR=${MEDFILE_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ROOT_DIR=${PARAVIEW_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPETSC_DIR=${PETSC_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGUI_ROOT_DIR=${GUI_ROOT_DIR}"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
 else
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCOREFLOWS_WITH_GUI=ON"
 fi
 
 if [ -n "$SAT_HPC" ]
 then
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DMPI_HOME=${MPI_ROOT_DIR}"
+    if [ $VERSION == "V9_6_0" ]
+    then
+        # following variable is automatically detected in environment after 9.6.0
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DMPI_HOME=${MPI_ROOT_DIR}"
+    fi
     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"
 fi