From a1137383b665fed7cdd276b166863734de0af007 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 3 Mar 2022 12:55:32 +0100 Subject: [PATCH] zeromq: DB10 - target mpicxx and mpicc --- products/compil_scripts/zeromq-4.3.1.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/products/compil_scripts/zeromq-4.3.1.sh b/products/compil_scripts/zeromq-4.3.1.sh index 9b4e610..5b02fd2 100755 --- 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 "##########################################################################" -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" @@ -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 +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 -- 2.39.2