Prefix FEATURE_*_BUNDLED_CONFIGURED with DEAL_II

diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt
index cce04492e3c453498345e5f89be36e270437a17e..6027481e90d3558d445f359f767e60c64c4df22a 100644 (file)
--- a/bundled/CMakeLists.txt
+++ b/bundled/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
   ${DEAL_II_INCLUDE_DIRS}
   )
 
-if(FEATURE_BOOST_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
   add_subdirectory(${BOOST_FOLDER}/libs/serialization/src)
   add_subdirectory(${BOOST_FOLDER}/libs/system/src)
 
@@ -41,7 +41,7 @@ if(FEATURE_BOOST_BUNDLED_CONFIGURED)
 endif()
 
 
-if(FEATURE_KOKKOS_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_KOKKOS_BUNDLED_CONFIGURED)
   add_subdirectory(${KOKKOS_FOLDER})
 
   install(DIRECTORY
@@ -57,7 +57,7 @@ if(FEATURE_KOKKOS_BUNDLED_CONFIGURED)
 endif()
 
 
-if(FEATURE_TASKFLOW_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_TASKFLOW_BUNDLED_CONFIGURED)
   install(DIRECTORY ${TASKFLOW_FOLDER}/include/taskflow
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
@@ -65,7 +65,7 @@ if(FEATURE_TASKFLOW_BUNDLED_CONFIGURED)
 endif()
 
 
-if(FEATURE_TBB_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_TBB_BUNDLED_CONFIGURED)
   add_subdirectory(${TBB_FOLDER}/src)
 
   install(DIRECTORY ${TBB_FOLDER}/include/tbb
@@ -76,7 +76,7 @@ if(FEATURE_TBB_BUNDLED_CONFIGURED)
 endif()
 
 
-if(FEATURE_UMFPACK_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_UMFPACK_BUNDLED_CONFIGURED)
   add_subdirectory(${UMFPACK_FOLDER}/UMFPACK/Source)
   add_subdirectory(${UMFPACK_FOLDER}/AMD/Source)
 
@@ -90,7 +90,7 @@ if(FEATURE_UMFPACK_BUNDLED_CONFIGURED)
 endif()
 
 
-if(FEATURE_MUPARSER_BUNDLED_CONFIGURED)
+if(DEAL_II_FEATURE_MUPARSER_BUNDLED_CONFIGURED)
   add_subdirectory(${MUPARSER_FOLDER})
 endif()
 

diff --git a/cmake/configure/configure_50_adolc.cmake b/cmake/configure/configure_50_adolc.cmake
index f7ed6645380d0954503f1edd7bd91e4488d70a25..e3690c745fb3fe58d91d37a2e036d2295bbaef19 100644 (file)
--- a/cmake/configure/configure_50_adolc.cmake
+++ b/cmake/configure/configure_50_adolc.cmake
@@ -32,7 +32,7 @@ macro(feature_adolc_find_external var)
     # If Adolc is configured to use the Boost allocator (of an external
     # boost library) we must not use a bundled Boost library for deal.II.
     #
-    if(ADOLC_WITH_BOOST_ALLOCATOR AND FEATURE_BOOST_BUNDLED_CONFIGURED)
+    if(ADOLC_WITH_BOOST_ALLOCATOR AND DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
       message(STATUS
         "Could not find a sufficient ADOL-C installation: "
         "ADOL-C links against external Boost but deal.II was configured "

diff --git a/cmake/configure/configure_50_cgal.cmake b/cmake/configure/configure_50_cgal.cmake
index 968b841b706ad0a820917797e47fcab6352301a9..21e96adfd9ba5b837ff6d5187975939f3c680b97 100644 (file)
--- a/cmake/configure/configure_50_cgal.cmake
+++ b/cmake/configure/configure_50_cgal.cmake
@@ -38,7 +38,7 @@ macro(feature_cgal_find_external var)
   # CGAL requires an full, externally installed Boost library. We can thus
   # not configure our internal boost and try to use CGAL at the same time.
   #
-  if(FEATURE_BOOST_BUNDLED_CONFIGURED)
+  if(DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
     message(STATUS
       "Could not find a sufficient CGAL installation: "
       "CGAL links against external Boost but deal.II was configured "

diff --git a/cmake/macros/macro_configure_feature.cmake b/cmake/macros/macro_configure_feature.cmake
index dc4e6a1c7dc5b1b82063b28ce720502f0ec3bc48..ebbf0a7f8665dea0a78b1cd5dd7ed675dcc1cd9b 100644 (file)
--- a/cmake/macros/macro_configure_feature.cmake
+++ b/cmake/macros/macro_configure_feature.cmake
@@ -221,7 +221,7 @@ macro(configure_feature _feature)
           evaluate_expression("feature_${_feature}_configure_bundled()")
           message(STATUS "")
           message(STATUS "DEAL_II_WITH_${_feature} successfully set up with bundled packages.")
-          set(FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
+          set(DEAL_II_FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
           set_cached_option(${_feature} ON)
         else()
           message(FATAL_ERROR "\n"
@@ -263,7 +263,7 @@ macro(configure_feature _feature)
             evaluate_expression("feature_${_feature}_configure_bundled()")
 
             message(STATUS "DEAL_II_WITH_${_feature} successfully set up with bundled packages.")
-            set(FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
+            set(DEAL_II_FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
             set_cached_option(${_feature} ON)
 
           else()

diff --git a/cmake/modules/FindDEAL_II_CGAL.cmake b/cmake/modules/FindDEAL_II_CGAL.cmake
index e067c116f685c33fd5c6a35bcb86f495a5074598..4458121d33e5daf55bfc454206868ee1289fd2e1 100644 (file)
--- a/cmake/modules/FindDEAL_II_CGAL.cmake
+++ b/cmake/modules/FindDEAL_II_CGAL.cmake
@@ -36,7 +36,7 @@ endif()
 # call to find_package(CGAL) will fail. Guard the call to FIND_PACKAGE to
 # fail gracefully:
 #
-if(DEAL_II_HAVE_CXX17 AND NOT FEATURE_BOOST_BUNDLED_CONFIGURED)
+if(DEAL_II_HAVE_CXX17 AND NOT DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
   set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE ON)
   find_package(CGAL QUIET)
 

diff --git a/cmake/setup_write_config.cmake b/cmake/setup_write_config.cmake
index bf1d3ef422ba79bc1ae900f95053970424127e24..8bf9a2b257ef66eee0148949cb8d404e31139d4e 100644 (file)
--- a/cmake/setup_write_config.cmake
+++ b/cmake/setup_write_config.cmake
@@ -177,7 +177,7 @@ foreach(_feature ${_deal_ii_features_sorted})
     #
     if(FEATURE_${_feature}_EXTERNAL_CONFIGURED)
       _both("#        ${_var} set up with external dependencies\n")
-    elseif(FEATURE_${_feature}_BUNDLED_CONFIGURED)
+    elseif(DEAL_II_FEATURE_${_feature}_BUNDLED_CONFIGURED)
       if(DEAL_II_FORCE_BUNDLED_${_feature})
         _both("#        ${_var} set up with bundled packages (forced)\n")
       else()

diff --git a/contrib/python-bindings/CMakeLists.txt b/contrib/python-bindings/CMakeLists.txt
index eb2935983f3ad3972d528ca80760cac2771dbe76..77613e20d43580269fd159bf2ad6e25b752cc6a1 100644 (file)
--- a/contrib/python-bindings/CMakeLists.txt
+++ b/contrib/python-bindings/CMakeLists.txt
@@ -32,7 +32,7 @@ if(DEAL_II_COMPONENT_PYTHON_BINDINGS)
   endif()
   include(FindPythonLibs)
 
-  if(FEATURE_BOOST_BUNDLED_CONFIGURED)
+  if(DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED)
     message(FATAL_ERROR
       "DEAL_II_COMPONENT_PYTHON_BINDINGS has unmet configuration requirements: "
       "Python bindings require an external boost library, but deal.II was "

diff --git a/doc/developers/cmake-internals.html b/doc/developers/cmake-internals.html
index e7b65e9f479dafe32cbeadbb46843e783e6ed3f3..7a2f8cc8d6a48ef8f49f9d87b919d5f9ffde50e7 100644 (file)
--- a/doc/developers/cmake-internals.html
+++ b/doc/developers/cmake-internals.html
@@ -499,7 +499,7 @@ DEAL_II_FORCE_BUNDLED_<FEATURE>        (an option)
 
     <li>
       Furthermore, if
-      <code>FEATURE_&lt;FEATURE&gt;_BUNDLED_CONFIGURED</code> is set to
+      <code>DEAL_II_FEATURE_&lt;FEATURE&gt;_BUNDLED_CONFIGURED</code> is set to
       <code>TRUE</code> the file <code>./bundled/CMakeLists.txt</code>
       must compile and install the bundled package appropriately.
   </ul>

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index a6283badcc19b9d01e4fcacc197fe423235dbaab..d8a0438acce52f504577995c7aa351efaa8bf210 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -39,9 +39,7 @@
 #cmakedefine DEAL_II_WITH_ARPACK
 #cmakedefine DEAL_II_WITH_ARBORX
 #cmakedefine DEAL_II_WITH_ASSIMP
-#ifdef FEATURE_BOOST_BUNDLED_CONFIGURED
-#  define DEAL_II_WITH_BOOST_BUNDLED
-#endif
+#cmakedefine DEAL_II_FEATURE_BOOST_BUNDLED_CONFIGURED
 #cmakedefine DEAL_II_WITH_CGAL
 #cmakedefine DEAL_II_WITH_COMPLEX_VALUES
 #cmakedefine DEAL_II_WITH_CUDA