CMake: Use DEAL_II_WARNING_FLAGS in deal.II internal and user macros

diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake
index 2c6bba82c00afe3afc4a63d035ec83652167af6c..7efd8083d74ac8dd20b24f0b8af900be033c65ae 100644 (file)
--- 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 f6449755161b024ed8f1204dda9d1beacbb824cf..2110a585e375da702a1d0f63d34c866c6dcb01cb 100644 (file)
--- 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 255398e8d06a93d9041d3897d79f40c5509f17ec..c5ca94c3065edb4f145335b9912fa721883972b6 100644 (file)
--- 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})