Fix MPIEXEC detection again.

We should check the value deal.II finally stores - other MPI variables are not
necessarily set at this point.

diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake
index d24d5c53427f0746549e5dd4c09520b984d62cf0..082d9b668b8dde943b38495f4377d9a17ac5ecf6 100644 (file)
--- 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.")