From 653d5aa30a72da5097c86dee2afc5f6eeca3cbef Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Sun, 27 Feb 2022 09:33:34 +0100 Subject: [PATCH] spns #26828: convergence EDF: native build --- products/compil_scripts/PERSALYS-v11.0.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh index 7c060c7..f702922 100755 --- a/products/compil_scripts/PERSALYS-v11.0.sh +++ b/products/compil_scripts/PERSALYS-v11.0.sh @@ -8,6 +8,7 @@ if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then echo "WARNING: setting CC and CXX environment variables and target MPI wrapper" CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}" CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" + CMAKE_OPTIONS+=" -DMPI_C_FOUND=$MPI_C_FOUND" fi CMAKE_OPTIONS="" @@ -30,9 +31,10 @@ CMAKE_OPTIONS+=" -DAdaoCppLayer_ROOT_DIR=$ADAO_INTERFACE_ROOT_DIR" CMAKE_OPTIONS+=" -DUSE_SALOME=ON" CMAKE_OPTIONS+=" -DGDAL_LIBRARY=$GDALHOME/lib/libgdal.so" CMAKE_OPTIONS+=" -DGDAL_INCLUDE_DIR=$GDALHOME/include" -CMAKE_OPTIONS+=" -DTBB_ROOT=$TBB_ROOT_DIR" -CMAKE_OPTIONS+=" -DTBB_INCLUDE_DIR=$TBB_ROOT_DIR/include" -CMAKE_OPTIONS+=" -DMPI_C_FOUND=$MPI_C_FOUND" +if [ ! -z "$TBB_ROOT_DIR" ]; then + CMAKE_OPTIONS+=" -DTBB_ROOT=$TBB_ROOT_DIR" + CMAKE_OPTIONS+=" -DTBB_INCLUDE_DIR=$TBB_ROOT_DIR/include" +fi CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=$PYTHONBIN" CMAKE_OPTIONS+=" -DOTGUI_PYTHON_VERSION=$PYTHON_VERSION" CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE" -- 2.39.2