X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fopenturns-1.16.sh;h=863adb32e5efd9d28b27c6b978c6fcc96e6a5551;hb=d652b419448523734dd946ae814383bb2c69ff27;hp=927bcc9418f0afbde0760b55d7a23a64df7082a2;hpb=344f7a595232e2fe0bc5bda446be13dbf84f680c;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/openturns-1.16.sh b/products/compil_scripts/openturns-1.16.sh
index 927bcc9..863adb3 100755
--- a/products/compil_scripts/openturns-1.16.sh
+++ b/products/compil_scripts/openturns-1.16.sh
@@ -4,14 +4,12 @@ echo "##########################################################################
 echo "openturns" $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
-
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
@@ -20,8 +18,7 @@ CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on cmake"
     exit 1
 fi
@@ -29,8 +26,7 @@ fi
 echo
 echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make"
     exit 2
 fi
@@ -38,8 +34,7 @@ fi
 echo
 echo "*** make install"
 make install
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make install"
     exit 3
 fi
@@ -47,8 +42,7 @@ fi
 echo
 echo "*** check installation"
 
-if [ -d "${PRODUCT_INSTALL}/lib64" ]
-then
+if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
     mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
     rmdir ${PRODUCT_INSTALL}/lib64
 fi
@@ -57,8 +51,7 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$
 export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH}
 chmod +x ${SOURCE_DIR}/python/test/t_features.py
 ${SOURCE_DIR}/python/test/t_features.py
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR  testing Openturns features...."
     exit 4
 fi