From 97e047fd113322118821ae1f69c445ff8407e496 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 29 Mar 2023 12:49:23 -0500 Subject: [PATCH] CMake: Use DEAL_II_WARNING_FLAGS in deal.II internal and user macros --- cmake/macros/macro_deal_ii_setup_target.cmake | 2 +- cmake/macros/macro_insource_setup_target.cmake | 2 +- cmake/macros/macro_populate_target_properties.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake index 2c6bba82c0..7efd8083d7 100644 --- a/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/cmake/macros/macro_deal_ii_setup_target.cmake @@ -91,7 +91,7 @@ macro(deal_ii_setup_target _target) endif() separate_arguments(_compile_options UNIX_COMMAND - "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" + "${DEAL_II_WARNING_FLAGS} ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) shell_escape_option_groups(_compile_options) target_compile_options(${_target} PRIVATE diff --git a/cmake/macros/macro_insource_setup_target.cmake b/cmake/macros/macro_insource_setup_target.cmake index f644975516..2110a585e3 100644 --- a/cmake/macros/macro_insource_setup_target.cmake +++ b/cmake/macros/macro_insource_setup_target.cmake @@ -32,7 +32,7 @@ function(insource_setup_target _target _build) ) separate_arguments(_compile_options UNIX_COMMAND - "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" + "${DEAL_II_WARNING_FLAGS} ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) shell_escape_option_groups(_compile_options) target_compile_options(${_target} PRIVATE ${_compile_options}) diff --git a/cmake/macros/macro_populate_target_properties.cmake b/cmake/macros/macro_populate_target_properties.cmake index 255398e8d0..c5ca94c306 100644 --- a/cmake/macros/macro_populate_target_properties.cmake +++ b/cmake/macros/macro_populate_target_properties.cmake @@ -105,7 +105,7 @@ function(populate_target_properties _target _build) # separate_arguments(_compile_options UNIX_COMMAND - "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" + "${DEAL_II_WARNING_FLAGS} ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" ) shell_escape_option_groups(_compile_options) target_compile_options(${_target} PRIVATE ${_compile_options}) -- 2.39.5