X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fopenturns.sh;h=be3a91b6277eded1fc7b97220d5ea40e0dccc844;hb=81312c5ebcba0f4e03e4dfe58ce54efd706dc40b;hp=d51bb226ef0db135435991cc5235b5c7372f3959;hpb=8dad2a00edc9baafbc58db9fd27eb9192cf2642d;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/openturns.sh b/products/compil_scripts/openturns.sh
index d51bb22..be3a91b 100755
--- a/products/compil_scripts/openturns.sh
+++ b/products/compil_scripts/openturns.sh
@@ -4,10 +4,18 @@ echo "##########################################################################
 echo "openturns" $VERSION
 echo "##########################################################################"
 
+if [ -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
+fi
+
 CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 
 echo
 echo "*** cmake" $CMAKE_OPTIONS
@@ -39,6 +47,12 @@ fi
 echo
 echo "*** check installation"
 
+if [ -d "${PRODUCT_INSTALL}/lib64" ]
+then
+    mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
+    rmdir ${PRODUCT_INSTALL}/lib64
+fi
+
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
 export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH}
 chmod +x ${SOURCE_DIR}/python/test/t_features.py