From 86b72d481f1d041b0250405d2805b229a4bb5efd Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 9 Dec 2020 09:37:22 +0100 Subject: [PATCH] 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 Reviewed-by: Eric Lemanissier (cherry picked from commit 88fe9d3d977b865802085fbd6b5a43dbb39b116d) Reviewed-by: Qt Cherry-pick Bot --- src/tools/bootstrap/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 218d634683b..75f2d3ee4bc 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