summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-12-09 09:37:22 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-10 21:19:01 +0000
commit86b72d481f1d041b0250405d2805b229a4bb5efd (patch)
tree10b64a036b81642f05adf72e989d3b946314fa92
parente9af2a9519f12cd19d23876dd6a22be911f48372 (diff)
CMake: Fix FEATURE_static_runtime build
We must call qt_set_common_target_properties on Bootstrap too, because that's were FEATURE_static_runtime is handled. Change-Id: Ie54f7d599d0c3a54b761e6c679983b475e77c17d Fixes: QTBUG-89201 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Eric Lemanissier <eric.lemanissier@gmail.com> (cherry picked from commit 88fe9d3d977b865802085fbd6b5a43dbb39b116d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/tools/bootstrap/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 218d634683..75f2d3ee4b 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -267,6 +267,7 @@ qt_internal_apply_gc_binaries(Bootstrap PUBLIC)
set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
qt_internal_add_target_aliases(Bootstrap)
qt_set_msvc_cplusplus_options(Bootstrap PUBLIC)
+qt_set_common_target_properties(Bootstrap)
qt_internal_apply_intel_cet(Bootstrap PUBLIC)
qt_internal_extend_target(Bootstrap CONDITION MSVC