Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spns #29880 : UB22.04 support: opencv - omniORB
[tools/sat_salome.git]
/
products
/
compil_scripts
/
zeromq-4.3.1.sh
diff --git
a/products/compil_scripts/zeromq-4.3.1.sh
b/products/compil_scripts/zeromq-4.3.1.sh
index 9b4e610bed664e773b04501c5a2930579bd08c08..5b02fd25dcb560c0df9b58625db719bd281ed08f 100755
(executable)
--- a/
products/compil_scripts/zeromq-4.3.1.sh
+++ b/
products/compil_scripts/zeromq-4.3.1.sh
@@
-4,13
+4,6
@@
echo "##########################################################################
echo "zeromq" $VERSION
echo "##########################################################################"
echo "zeromq" $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+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
CMAKE_OPTIONS=""
CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
@@
-20,6
+13,10
@@
if [ -n "$LIBXML2_ROOT_DIR" ] && [ "${LIBXML2_ROOT_DIR}" != "/usr" ]; then
CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
+if [ -n "$MPI_ROOT_DIR" ]; then
+ CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+ CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+fi
echo
echo "*** cmake" $CMAKE_OPTIONS
echo
echo "*** cmake" $CMAKE_OPTIONS