]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix MPIEXEC detection again. 10785/head
authorDavid Wells <drwells@email.unc.edu>
Sat, 1 Aug 2020 12:26:43 +0000 (08:26 -0400)
committerDavid Wells <drwells@email.unc.edu>
Sat, 1 Aug 2020 13:30:28 +0000 (09:30 -0400)
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

index d24d5c53427f0746549e5dd4c09520b984d62cf0..082d9b668b8dde943b38495f4377d9a17ac5ecf6 100644 (file)
@@ -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.")

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.