From 995ad6980a98d477822fff17c3da547b1e0f2619 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Sat, 26 Nov 2022 07:58:51 -0600
Subject: [PATCH] CMake: simplify clean/purge_feature macros

---
 cmake/macros/macro_clear_feature.cmake | 5 +----
 cmake/macros/macro_purge_feature.cmake | 7 +------
 2 files changed, 2 insertions(+), 10 deletions(-)

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)
 
-- 
2.39.5