From ee534712e66c944ad5236d643ad52d82686fa6e0 Mon Sep 17 00:00:00 2001 From: NDJINGA Michael Date: Thu, 20 Jan 2022 14:49:50 +0100 Subject: [PATCH] Corrected MPI detection --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd890b5..237fb47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,9 +60,13 @@ list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files") ############################# # Detection of MPI + MPI4PY # ############################# -if ( DEFINED MPI_ROOT_DIR ) - set(MPI_HOME ${MPI_ROOT_DIR}) -endif( DEFINED MPI_ROOT_DIR ) +if ( DEFINED ENV{MPI_ROOT_DIR} OR DEFINED MPI_ROOT_DIR ) + if ( DEFINED ENV{MPI_ROOT_DIR} ) + set(MPI_HOME $ENV{MPI_ROOT_DIR}) + else ( DEFINED ENV{MPI_ROOT_DIR} ) + set(MPI_HOME ${MPI_ROOT_DIR}) + endif( DEFINED ENV{MPI_ROOT_DIR} ) +endif( DEFINED ENV{MPI_ROOT_DIR} OR DEFINED MPI_ROOT_DIR ) # Definition of SOLVERLAB_WITH_MPI if( DEFINED ENV{MPI_HOME} OR MPI_HOME ) -- 2.30.2