From 5e2406fcfdc7838a44d64f138593f30afbae1672 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 12 Jul 2016 13:20:17 -0500 Subject: [PATCH] CMake: Bugfix: Do not error out if a variable for a feature constraint is undefined --- cmake/macros/macro_deal_ii_pickup_tests.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake index 6dab7db605..07031858d8 100644 --- a/cmake/macros/macro_deal_ii_pickup_tests.cmake +++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake @@ -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_ and DEAL_II_ # @@ -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() -- 2.39.5