]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Bugfix: Do not error out if a variable for a feature constraint is undefined
authorMatthias Maier <tamiko@43-1.org>
Tue, 12 Jul 2016 18:20:17 +0000 (13:20 -0500)
committerMatthias Maier <tamiko@43-1.org>
Wed, 13 Jul 2016 13:51:03 +0000 (08:51 -0500)
cmake/macros/macro_deal_ii_pickup_tests.cmake

index 6dab7db60502fe79051d96a7a76028792c24515b..07031858d8be07404ccd23fe020b5d664bda482c 100644 (file)
@@ -177,8 +177,6 @@ MACRO(DEAL_II_PICKUP_TESTS)
       STRING(REGEX MATCH "(on|off|yes|no|true|false)$" _boolean ${_match})
       STRING(REGEX MATCH "([0-9]+(\\.[0-9]+)*)$" _version ${_match})
 
-      #
-      # Valid feature?
       #
       # We support two variables: DEAL_II_WITH_<FEATURE> and DEAL_II_<FEATURE>
       #
@@ -186,11 +184,11 @@ MACRO(DEAL_II_PICKUP_TESTS)
       IF(NOT DEFINED ${_variable})
         SET(_variable "DEAL_II_${_feature}")
         IF(NOT DEFINED ${_variable})
-          MESSAGE(FATAL_ERROR "
-Invalid feature constraint \"${_match}\" in file
-\"${_comparison}\":
-The feature \"DEAL_II_WITH_${_feature}\" (or \"DEAL_II_${_feature}\") does not exist.\n"
-            )
+          #
+          # If a variable is undefined, assume that we cannot configure a
+          # given test
+          #
+          SET(_define_test FALSE)
         ENDIF()
       ENDIF()
 

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.