From 6c2530d339b5927bf069451e605d023f2a02e6b2 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 23 Apr 2024 13:39:44 -0500 Subject: [PATCH] Revert "Export compile definitions for dependent targets" This reverts commit a29f491fc2a054b0545212d34261ea0270b0dc64. --- cmake/config/Config.cmake.in | 8 -------- cmake/macros/macro_deal_ii_setup_target.cmake | 4 ---- cmake/macros/macro_insource_setup_target.cmake | 4 ---- 3 files changed, 16 deletions(-) diff --git a/cmake/config/Config.cmake.in b/cmake/config/Config.cmake.in index 4601b27c8a..77f305e738 100644 --- a/cmake/config/Config.cmake.in +++ b/cmake/config/Config.cmake.in @@ -124,14 +124,6 @@ set(DEAL_II_LINKER_FLAGS_DEBUG "@DEAL_II_LINKER_FLAGS_DEBUG@") # _additionally_ used for release targets: set(DEAL_II_LINKER_FLAGS_RELEASE "@DEAL_II_LINKER_FLAGS_RELEASE@") -# used for all targets: -set(DEAL_II_DEFINITIONS "@DEAL_II_DEFINITIONS@") - -# _additionally_ used for debug targets: -set(DEAL_II_DEFINITIONS_DEBUG "@DEAL_II_DEFINITIONS_DEBUG@") - -# _additionally_ used for release targets: -set(DEAL_II_DEFINITIONS_RELEASE "@DEAL_II_DEFINITIONS_RELEASE@") # # MPI runtime: # diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake index a8192949e1..4024eed956 100644 --- a/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/cmake/macros/macro_deal_ii_setup_target.cmake @@ -93,10 +93,6 @@ macro(deal_ii_setup_target _target) "${DEAL_II_WARNING_FLAGS} ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) - target_compile_definitions(${_target} PRIVATE - ${DEAL_II_DEFINITIONS} ${DEAL_II_DEFINITIONS_${_build}} - ) - get_property(_type TARGET ${_target} PROPERTY TYPE) if(NOT "${_type}" STREQUAL "OBJECT_LIBRARY") target_link_flags(${_target} PRIVATE diff --git a/cmake/macros/macro_insource_setup_target.cmake b/cmake/macros/macro_insource_setup_target.cmake index db2ac168e0..c037ac0a46 100644 --- a/cmake/macros/macro_insource_setup_target.cmake +++ b/cmake/macros/macro_insource_setup_target.cmake @@ -34,10 +34,6 @@ function(insource_setup_target _target _build) "${DEAL_II_WARNING_FLAGS} ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) - target_compile_definitions(${_target} PRIVATE - ${DEAL_II_DEFINITIONS} ${DEAL_II_DEFINITIONS_${_build}} - ) - get_property(_type TARGET ${_target} PROPERTY TYPE) if(NOT "${_type}" STREQUAL "OBJECT_LIBRARY") target_link_flags(${_target} PRIVATE -- 2.39.5