From 32d7c51f0d7cc2cf8786fd0bc3f42efed06c9171 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 1 Aug 2020 08:26:43 -0400 Subject: [PATCH] Fix MPIEXEC detection again. We should check the value deal.II finally stores - other MPI variables are not necessarily set at this point. --- cmake/macros/macro_deal_ii_pickup_tests.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake index d24d5c5342..082d9b668b 100644 --- a/cmake/macros/macro_deal_ii_pickup_tests.cmake +++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake @@ -83,7 +83,8 @@ MACRO(DEAL_II_PICKUP_TESTS) # Necessary external interpreters and programs: # IF(${DEAL_II_WITH_MPI}) - IF( "${MPIEXEC_EXECUTABLE}" STREQUAL "") + IF("${DEAL_II_MPIEXEC}" STREQUAL "" OR + "${DEAL_II_MPIEXEC}" STREQUAL "MPIEXEC_EXECUTABLE-NOTFOUND") MESSAGE(FATAL_ERROR "Could not find an MPI launcher program, which is required " "for running the testsuite. Please explicitly specify MPIEXEC_EXECUTABLE to CMake " "as a full path to the MPI launcher program.") -- 2.39.5