From bbcdcb6daefa554a21dd91192837521e23640e21 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 19 May 2021 19:02:18 -0700 Subject: [PATCH] Remove problem not finding MPI_EXTRA_LIBRARY and setting no-mpi build to include dummyMPI/mpi.h. --- Code/CMake/FindMPI.cmake | 1 + Code/FlowSolvers/ThreeDSolver/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Code/CMake/FindMPI.cmake b/Code/CMake/FindMPI.cmake index e165e9d2..85913355 100644 --- a/Code/CMake/FindMPI.cmake +++ b/Code/CMake/FindMPI.cmake @@ -625,6 +625,7 @@ if (MPI_NUMLIBS GREATER 1) set(MPI_EXTRA_LIBRARY ${MPI_EXTRA_LIBRARY_WORK} CACHE STRING "Extra MPI libraries to link against" FORCE) else() set(MPI_EXTRA_LIBRARY "MPI_EXTRA_LIBRARY-NOTFOUND" CACHE STRING "Extra MPI libraries to link against" FORCE) + set(MPI_EXTRA_LIBRARY "") endif() #============================================================================= diff --git a/Code/FlowSolvers/ThreeDSolver/CMakeLists.txt b/Code/FlowSolvers/ThreeDSolver/CMakeLists.txt index 19d3050f..d3f00ddc 100644 --- a/Code/FlowSolvers/ThreeDSolver/CMakeLists.txt +++ b/Code/FlowSolvers/ThreeDSolver/CMakeLists.txt @@ -113,6 +113,8 @@ if(NOT SV_USE_DUMMY_MPI) if(SV_BUILD_ADDITIONAL_NOMPI_VERSION) set(SV_USE_DUMMY_MPI ON) set(SV_MPI_NAME_EXT "-nompi") + # Set including the mpi.h from dummyMPI. + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/dummyMPI) add_subdirectory(dummyMPI) add_subdirectory(svLS svLS${SV_MPI_NAME_EXT}) add_subdirectory(svSolver svSolver${SV_MPI_NAME_EXT})