From 0ba9e3f00ff9f3f27c19e4ad3bae9ea611963031 Mon Sep 17 00:00:00 2001 From: Li Xinwei <1326710505@qq.com> Date: Mon, 14 Dec 2020 01:13:18 +0800 Subject: [PATCH] CMake: Fix compile warnings when MSVC and -DFEATURE_static_runtime=ON When using MSVC compiler and -DFEATURE_static_runtime=ON, qrc_foo.cpp and qtentrypoint_win.cpp are still compiled with '-MD' or '-MDd' flag, which will cause following warnings and other possible problems: warning LNK4098: defaultlib "MSVCRT" conflicts with use of other libs; use /NODEFAULTLIB:library Change-Id: I6794930a64e9cff4dc1c9632fc3fc64227848af0 Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Joerg Bornemann (cherry picked from commit 21e4e85a5798884837b35859f73f1eca4cb976d2) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtResourceHelpers.cmake | 2 ++ src/entrypoint/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index 9715873d9c2..1c18de41fdb 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -86,5 +86,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) # Make sure that the target cpp files are compiled with the regular Qt internal compile # flags, needed for building iOS apps with qmake where bitcode is involved. target_link_libraries("${out_target}" PRIVATE Qt::PlatformModuleInternal) + + qt_set_common_target_properties(${out_target}) endforeach() endfunction() diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index f11ab855420..ba35a173d70 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -44,6 +44,7 @@ if(using_entrypoint_library) qt_handle_multi_config_output_dirs(EntryPointImplementation) qt_internal_add_target_aliases(EntryPointImplementation) + qt_set_common_target_properties(EntryPointImplementation) endif() # ---- Now we're ready to set up the platform specifics ----