From: David Wells Date: Sat, 10 Aug 2019 19:31:17 +0000 (-0600) Subject: Fix a check on numdiff. X-Git-Tag: v9.2.0-rc1~1142^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6bb7cc80acab420822adc5a5823863c10d3978d;p=dealii.git Fix a check on numdiff. This check didn't work for two reasons: 1. We should expand the variable 2. FIND_PROGRAM indicates failure by setting the value of the variable to 'variable-NOTFOUND', not '-NOTFOUND'. --- diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake index cd3cf6af97..085ec637a5 100644 --- a/cmake/macros/macro_deal_ii_pickup_tests.cmake +++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake @@ -98,7 +98,7 @@ MACRO(DEAL_II_PICKUP_TESTS) MARK_AS_ADVANCED(NUMDIFF_EXECUTABLE) - IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND") + IF( "${NUMDIFF_EXECUTABLE}" MATCHES "NUMDIFF_EXECUTABLE-NOTFOUND") MESSAGE(FATAL_ERROR "Could not find numdiff, which is required for running the testsuite.\n" "Please specify NUMDIFF_DIR to a location containing the binary." @@ -117,9 +117,9 @@ MACRO(DEAL_II_PICKUP_TESTS) IF(NOT "${_diff_program_status}" STREQUAL "0") MESSAGE(FATAL_ERROR - "\nThe command \"${_diff_program} -v\" did not run correctly: it either " - "failed to exit after a few seconds or returned a nonzero exit code. " - "The test suite cannot be set up without this program, so please " + "\nThe command \"${NUMDIFF_EXECUTABLE} -v\" did not run correctly: it " + "either failed to exit after a few seconds or returned a nonzero exit " + "code. The test suite cannot be set up without this program, so please " "reinstall it and then run the test suite setup command again.\n") ENDIF()