CMake: simplify clean/purge_feature macros

dealii · Nov 26, 2022 · 995ad69 · 995ad69
1 parent c255471
commit 995ad69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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
@@ -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)