Fix path to mpicc and mpicxx

[tools/sat_salome.git] / products / compil_scripts / topo2volmesh.sh

diff --git a/products/compil_scripts/topo2volmesh.sh b/products/compil_scripts/topo2volmesh.sh
index c8843faf1a76018612d912931f96e98314112834..9b6eb8193f221156b283ecc5fe5f70ffcdae942e 100755 (executable)
--- a/products/compil_scripts/topo2volmesh.sh
+++ b/products/compil_scripts/topo2volmesh.sh
@@ -4,32 +4,12 @@ echo "##########################################################################
 echo "topo2volmesh" $VERSION
 echo "##########################################################################"
 
+export CC=$(which mpicc)
+export CXX=$(which mpicxx)
+export MPICXX=$(which mpic++)
+
 CONFIGURE_FLAGS=
-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
-    CONFIGURE_FLAGS+=" --with-MPICXX=${MPI_ROOT_DIR}/bin/mpic++"
-else
-    LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
-    case $LINUX_DISTRIBUTION in
-        CO7|CO8|FD30|FD32|FD34)
-           # check whether openmpi is installed
-           x=$(yum list installed |grep openmpi)
-           if [ $? -ne 0 ]; then
-               echo "ERROR: openMPI is not installed!"
-               exit 1
-           fi
-           export CC=/usr/lib64/openmpi/bin/mpicc
-           export CXX=/usr/lib64/openmpi/bin/mpicxx
-           export PATH=$PATH:/usr/lib64/openmpi/bin
-           CONFIGURE_FLAGS+=" --with-MPICXX=/usr/lib64/openmpi/bin/mpic++"
-           ;;
-       *)
-           ;;
-    esac
-fi
+CONFIGURE_FLAGS+=" --with-MPICXX=${MPICXX}"
 
 rm -rf $BUILD_DIR
 mkdir $BUILD_DIR
@@ -75,7 +55,7 @@ fi
 echo
 echo "*** Check if node is a virtual machine"
 ISVM=$(hostnamectl status|grep -i chassis:|grep vm)
-if [ $? -ne 0 ]; then
+if [ ! -z "$ISVM" ]; then
     echo "*** oversubscribe..."
     sed -i 's/mpirun -np \$(NP)/mpirun -np \$(NP) --oversubscribe/g' src/*/Makefile.am
 else