summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorLi Xinwei <1326710505@qq.com>2020-12-14 01:13:18 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-17 11:37:54 +0000
commit0ba9e3f00ff9f3f27c19e4ad3bae9ea611963031 (patch)
treec3631b4369251a89ce915cd3b5bbf01bf1885b04 /cmake
parent11ae4beef6de7b8a9edad49184e13efb64c377b7 (diff)
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 <joerg.bornemann@qt.io> (cherry picked from commit 21e4e85a5798884837b35859f73f1eca4cb976d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtResourceHelpers.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake
index 9715873d9c..1c18de41fd 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()