From: Matthias Maier Date: Sat, 26 Nov 2022 13:58:51 +0000 (-0600) Subject: CMake: simplify clean/purge_feature macros X-Git-Tag: v9.5.0-rc1~805^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995ad6980a98d477822fff17c3da547b1e0f2619;p=dealii.git CMake: simplify clean/purge_feature macros --- diff --git a/cmake/macros/macro_clear_feature.cmake b/cmake/macros/macro_clear_feature.cmake index 94bf551a39..dc521cc608 100644 --- a/cmake/macros/macro_clear_feature.cmake +++ b/cmake/macros/macro_clear_feature.cmake @@ -25,10 +25,7 @@ # macro(CLEAR_FEATURE _feature) - foreach(_var ${DEAL_II_LIST_SUFFIXES}) - unset(${_feature}_${_var}) - endforeach() - foreach(_var ${DEAL_II_STRING_SUFFIXES}) + foreach(_var ${DEAL_II_LIST_SUFFIXES} ${DEAL_II_STRING_SUFFIXES}) unset(${_feature}_${_var}) endforeach() endmacro() diff --git a/cmake/macros/macro_purge_feature.cmake b/cmake/macros/macro_purge_feature.cmake index 90079f9443..7bc04df881 100644 --- a/cmake/macros/macro_purge_feature.cmake +++ b/cmake/macros/macro_purge_feature.cmake @@ -24,12 +24,7 @@ macro(PURGE_FEATURE _feature) # # uncached: # - foreach(_var ${DEAL_II_LIST_SUFFIXES} ${DEAL_II_STRING_SUFFIXES}) - if(NOT _var MATCHES BUNDLED) - set(${_feature}_${_var}) - endif() - endforeach() - + clear_feature(${_feature}) unset(${_feature}_FOUND) unset(${_feature}_VERSION)