diff options
| author | Amir Masoud Abdol <[email protected]> | 2023-06-01 11:50:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2023-06-01 17:28:19 +0000 |
| commit | ac4cece1fa259e56f640115ea5081b8103a72b0a (patch) | |
| tree | 7fff44db0d6cdcd8dbfa0d57785e433df097a224 | |
| parent | cb895b79331a027c2c2519143f9beb4592fd3304 (diff) | |
Set CMAKE_<LANG>_FLAGS in PARENT_SCOPE as well
Previously, we were not setting the CMAKE_<LANG>_FLAGS, instead we were
only processing the CMAKE_<LANG>_FLAGS_<CONFIG>. This patch amends that
so we also update the default flags list as well.
Change-Id: I7ceb87850a806fe8ad4eac6f8147b312eba01bc6
Reviewed-by: Alexandru Croitor <[email protected]>
(cherry picked from commit 63a0f4dc3b9cf5d091877c361e096ff176c52138)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index de6e917e906..a8a57393c65 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -1001,13 +1001,21 @@ function(qt_internal_set_up_config_optimizations_like_in_qmake) endif() # Update all relevant flags in the calling scope - foreach(config ${configs}) - foreach(lang ${enabled_languages}) + foreach(lang ${enabled_languages}) + set(flag_var_name "CMAKE_${lang}_FLAGS") + set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) + + foreach(config ${configs}) set(flag_var_name "CMAKE_${lang}_FLAGS_${config}") set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) endforeach() + endforeach() - foreach(t ${target_link_types}) + foreach(t ${target_link_types}) + set(flag_var_name "CMAKE_${t}_LINKER_FLAGS") + set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) + + foreach(config ${configs}) set(flag_var_name "CMAKE_${t}_LINKER_FLAGS_${config}") set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) endforeach() |