From 8a5b7823342af07a457b90c217b101578b34de22 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 11 Jan 2023 11:57:18 -0500 Subject: [PATCH] Prefix FEATURE_*_BUNDLED_CONFIGURED with DEAL_II --- bundled/CMakeLists.txt | 12 ++++++------ cmake/configure/configure_50_adolc.cmake | 2 +- cmake/configure/configure_50_cgal.cmake | 2 +- cmake/macros/macro_configure_feature.cmake | 4 ++-- cmake/modules/FindDEAL_II_CGAL.cmake | 2 +- cmake/setup_write_config.cmake | 2 +- contrib/python-bindings/CMakeLists.txt | 2 +- doc/developers/cmake-internals.html | 2 +- include/deal.II/base/config.h.in | 4 +--- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/bundled/CMakeLists.txt b/bundled/CMakeLists.txt index cce04492e3..6027481e90 100644 --- 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 f7ed664538..e3690c745f 100644 --- 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 968b841b70..21e96adfd9 100644 --- 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 dc4e6a1c7d..ebbf0a7f86 100644 --- 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 e067c116f6..4458121d33 100644 --- 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 bf1d3ef422..8bf9a2b257 100644 --- 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 eb2935983f..77613e20d4 100644 --- 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 e7b65e9f47..7a2f8cc8d6 100644 --- a/doc/developers/cmake-internals.html +++ b/doc/developers/cmake-internals.html @@ -499,7 +499,7 @@ DEAL_II_FORCE_BUNDLED_<FEATURE> (an option)
  • Furthermore, if - FEATURE_<FEATURE>_BUNDLED_CONFIGURED is set to + DEAL_II_FEATURE_<FEATURE>_BUNDLED_CONFIGURED is set to TRUE the file ./bundled/CMakeLists.txt must compile and install the bundled package appropriately. diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index a6283badcc..d8a0438acc 100644 --- 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 -- 2.39.5