From 23ae67c79d296bffeee4b75ee8bbaf433c1ffc63 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 30 Nov 2022 09:08:16 -0600 Subject: [PATCH] CMake: Remove deal.IIFeatureConfig.cmake --- cmake/config/CMakeLists.txt | 1 - cmake/config/Config.cmake.in | 3 --- cmake/setup_write_config.cmake | 12 +----------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index c7be0c2ee1..117f88cf23 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -175,7 +175,6 @@ configure_file( install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake - ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}FeatureConfig.cmake DESTINATION ${DEAL_II_PROJECT_CONFIG_RELDIR} COMPONENT library ) diff --git a/cmake/config/Config.cmake.in b/cmake/config/Config.cmake.in index 73d96b9686..1dca5d105c 100644 --- a/cmake/config/Config.cmake.in +++ b/cmake/config/Config.cmake.in @@ -191,6 +191,3 @@ set(DEAL_II_TARGET_RELEASE "@CONFIG_TARGET_RELEASE@") # Full list of targets with "debug" and "optimized" keywords for easy use with TARGET_LINK_LIBRARIES: set(DEAL_II_TARGET "@CONFIG_TARGET@") - -# The feature configuration file: -set(DEAL_II_FEATURE_CONFIG "${DEAL_II_PATH}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}FeatureConfig.cmake") diff --git a/cmake/setup_write_config.cmake b/cmake/setup_write_config.cmake index c0d34fdffd..4a639402b2 100644 --- a/cmake/setup_write_config.cmake +++ b/cmake/setup_write_config.cmake @@ -42,9 +42,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/revision.log set(_log_detailed "${CMAKE_BINARY_DIR}/detailed.log") set(_log_summary "${CMAKE_BINARY_DIR}/summary.log") -set(_log_feature "${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}FeatureConfig.cmake") -file(REMOVE ${_log_detailed} ${_log_summary} ${_log_feature}) -file(WRITE ${_log_feature} "") +file(REMOVE ${_log_detailed} ${_log_summary}) macro(_both) # Write to both log files: @@ -62,11 +60,6 @@ macro(_summary) file(APPEND ${_log_summary} "${ARGN}") endmacro() -macro(_featurelog) - # Only write to deal.IIFeatureConfig.cmake: - file(APPEND ${_log_feature} "${ARGN}") -endmacro() - _both( "### # @@ -227,12 +220,10 @@ foreach(_feature ${_deal_ii_features_sorted}) # if(NOT "${${_feature}_DIR}" STREQUAL "") _detailed("# ${_feature}_DIR = ${${_feature}_DIR}\n") - _featurelog("set(DEAL_II_${_feature}_DIR \"${${_feature}_DIR}\")\n") endif() if(NOT "${${_feature}_SPLIT_CONFIGURATION}" STREQUAL "") _detailed("# ${_feature}_SPLIT_CONFIGURATION = ${${_feature}_SPLIT_CONFIGURATION}\n") - _featurelog("set(DEAL_II_${_feature}_SPLIT_CONFIGURATION \"${${_feature}_SPLIT_CONFIGURATION}\")\n") endif() # @@ -244,7 +235,6 @@ foreach(_feature ${_deal_ii_features_sorted}) ) if(DEFINED ${_feature}_${_var2}) _detailed("# ${_feature}_${_var2} = ${${_feature}_${_var2}}\n") - _featurelog("set(DEAL_II_${_feature}_${_var2} \"${${_feature}_${_var2}}\")\n") endif() endforeach() else() -- 2.39.5