From 21996882cd54fb502dafd583a08e1cf081824d6d Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 10 Mar 2023 14:06:12 -0600 Subject: [PATCH] CMake: Remove most of the COMPILE_LANGUAGE generator expressions --- cmake/macros/macro_deal_ii_setup_target.cmake | 2 +- cmake/macros/macro_define_interface_target.cmake | 4 ++-- cmake/macros/macro_insource_setup_target.cmake | 8 ++------ cmake/macros/macro_populate_target_properties.cmake | 8 ++------ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake index 3c41999f09..807fcfa9ac 100644 --- a/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/cmake/macros/macro_deal_ii_setup_target.cmake @@ -105,7 +105,7 @@ macro(deal_ii_setup_target _target) ) shell_escape_option_groups(_link_options) target_link_options(${_target} PRIVATE - $<$:${_link_options}> + $<$:${_link_options}> ) endif() diff --git a/cmake/macros/macro_define_interface_target.cmake b/cmake/macros/macro_define_interface_target.cmake index f0444761b8..6cd70cf8d8 100644 --- a/cmake/macros/macro_define_interface_target.cmake +++ b/cmake/macros/macro_define_interface_target.cmake @@ -117,7 +117,7 @@ function(define_interface_target _feature) shell_escape_option_groups(_compile_options) if(NOT "${_compile_options}" STREQUAL "") message(STATUS " COMPILE_OPTIONS: ${_compile_options}") - target_compile_options(${_interface_target} INTERFACE $<$:${_compile_options}>) + target_compile_options(${_interface_target} INTERFACE ${_compile_options}) endif() separate_arguments(_link_options UNIX_COMMAND @@ -126,7 +126,7 @@ function(define_interface_target _feature) shell_escape_option_groups(_link_options) if(NOT "${_link_options}" STREQUAL "") message(STATUS " LINK_OPTIONS: ${_link_options}") - target_link_options(${_interface_target} INTERFACE $<$:${_link_options}>) + target_link_options(${_interface_target} INTERFACE ${_link_options}) endif() export(TARGETS ${_interface_target} diff --git a/cmake/macros/macro_insource_setup_target.cmake b/cmake/macros/macro_insource_setup_target.cmake index fb67006e38..f644975516 100644 --- a/cmake/macros/macro_insource_setup_target.cmake +++ b/cmake/macros/macro_insource_setup_target.cmake @@ -35,9 +35,7 @@ function(insource_setup_target _target _build) "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) shell_escape_option_groups(_compile_options) - target_compile_options(${_target} PRIVATE - $<$:${_compile_options}> - ) + target_compile_options(${_target} PRIVATE ${_compile_options}) get_property(_type TARGET ${_target} PROPERTY TYPE) if(NOT "${_type}" STREQUAL "OBJECT_LIBRARY") @@ -45,9 +43,7 @@ function(insource_setup_target _target _build) "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" ) shell_escape_option_groups(_link_options) - target_link_options(${_target} PRIVATE - $<$:${_link_options}> - ) + target_link_options(${_target} PRIVATE ${_link_options}) endif() target_include_directories(${_target} diff --git a/cmake/macros/macro_populate_target_properties.cmake b/cmake/macros/macro_populate_target_properties.cmake index 7c086fb150..df990a9dbd 100644 --- a/cmake/macros/macro_populate_target_properties.cmake +++ b/cmake/macros/macro_populate_target_properties.cmake @@ -96,9 +96,7 @@ function(populate_target_properties _target _build) "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) shell_escape_option_groups(_compile_options) - target_compile_options(${_target} PRIVATE - $<$:${_compile_options}> - ) + target_compile_options(${_target} PRIVATE ${_compile_options}) get_property(_type TARGET ${_target} PROPERTY TYPE) if(NOT "${_type}" STREQUAL "OBJECT_LIBRARY") @@ -106,9 +104,7 @@ function(populate_target_properties _target _build) "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" ) shell_escape_option_groups(_link_options) - target_link_options(${_target} PRIVATE - $<$:${_link_options}> - ) + target_link_options(${_target} PRIVATE ${_link_options}) endif() target_link_libraries(${_target} ${_visibility} -- 2.39.5