From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 23 Apr 2014 12:59:22 +0000 (+0000)
Subject: CMake: Ensure that DIFF_EXECUTABLE is always valid
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=350ef41d6cacebdee93395fda7cb6295ce955b89;p=dealii-svn.git

CMake: Ensure that DIFF_EXECUTABLE is always valid

git-svn-id: https://svn.dealii.org/trunk@32816 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake
index d2569ddde7..a1d6e1ac62 100644
--- a/deal.II/cmake/macros/macro_add_test.cmake
+++ b/deal.II/cmake/macros/macro_add_test.cmake
@@ -77,9 +77,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file)
 
   SET(_test_diff_variable TEST_DIFF)
   IF(_file MATCHES "\\.binary\\.")
-    IF(NOT DIFF_EXECUTABLE MATCHES "-NOTFOUND")
-      SET(_test_diff_variable DIFF_EXECUTABLE)
-    ENDIF()
+    SET(_test_diff_variable DIFF_EXECUTABLE)
   ENDIF()
 
   #
diff --git a/deal.II/cmake/setup_testsubproject.cmake b/deal.II/cmake/setup_testsubproject.cmake
index 6ed0f5dfb4..df352ffb47 100644
--- a/deal.II/cmake/setup_testsubproject.cmake
+++ b/deal.II/cmake/setup_testsubproject.cmake
@@ -106,6 +106,9 @@ IF("${TEST_DIFF}" STREQUAL "")
 
   IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
     SET(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -r 1e-8 -s ' \\t\\n:')
+    IF(DIFF_EXECUTABLE MATCHES "-NOTFOUND")
+      SET(DIFF_EXECUTABLE ${NUMDIFF_EXECUTABLE})
+    ENDIF()
   ELSEIF(NOT DIFF_EXECUTABLE MATCHES "-NOTFOUND")
     SET(TEST_DIFF ${DIFF_EXECUTABLE})
   ELSE()