From 0c1ed754fbefd012c60859c704df1b3970b82e78 Mon Sep 17 00:00:00 2001 From: NDJINGA Michael Date: Thu, 20 Jan 2022 16:34:46 +0100 Subject: [PATCH] Corrected detection of MPI_ROOT_DIR --- CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16fb08e..eabb926 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,13 +60,9 @@ list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files") ############################# # Detection of MPI + MPI4PY # ############################# -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 ) +if ( MPI_ROOT_DIR ) + set(MPI_HOME ${MPI_ROOT_DIR}) +endif( MPI_ROOT_DIR ) # Definition of SOLVERLAB_WITH_MPI if( DEFINED ENV{MPI_HOME} OR MPI_HOME ) @@ -660,7 +656,7 @@ if (SOLVERLAB_WITH_DOCUMENTATION) if ( SOLVERLAB_WITH_GUI OR COREFLOWS_WITH_GUI ) find_package(Sphinx) add_custom_target (docGUI COMMAND ${SPHINX_EXECUTABLE} -M html "${PROJECT_SOURCE_DIR}/CoreFlows/gui/doc" "${PROJECT_BINARY_DIR}/CoreFlows/gui/doc" SOURCES ${PROJECT_SOURCE_DIR}/CoreFlows/gui/doc) # - install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Utilities/html DESTINATION share/doc/solverlab-gui-doc OPTIONAL) # + install (DIRECTORY ${PROJECT_BINARY_DIR}/CoreFlows/gui/doc/html DESTINATION share/doc/solverlab-gui-doc OPTIONAL) # endif( SOLVERLAB_WITH_GUI OR COREFLOWS_WITH_GUI ) endif(SOLVERLAB_WITH_DOCUMENTATION) -- 2.39.2