diff options
| author | Li Xinwei <1326710505@qq.com> | 2021-06-03 18:50:27 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-09 11:48:11 +0000 |
| commit | 6f9f213530d89db0696eed52ef0c0c40ce64dea9 (patch) | |
| tree | 388cbf5239de01951ffd0217743de70578bb56b2 | |
| parent | efe0fc04b42b69a602730d5ce33e6f5be4f2a131 (diff) | |
| download | qttools-6f9f213530d89db0696eed52ef0c0c40ce64dea9.tar.gz | |
qlitehtml: fix build when QT_FEATURE_static_runtime is ON
If QT_FEATURE_static_runtime is ON, for MSVC, it means all source files
need to be compiled with '-MT' or '-MTd' flag. But qlitehtml is still
compiled with '-MD' or '-MDd' flag, this will cause link error.
Change-Id: I508f1b086c335292525b88522223b72c5ce72f45
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 279125469ac698ac289e6d07ffbb583636b18968)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/assistant/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt index 9bfa32b27..19eb21e75 100644 --- a/src/assistant/CMakeLists.txt +++ b/src/assistant/CMakeLists.txt @@ -25,6 +25,9 @@ set(QLITEHTML_BIN_PATH ${INSTALL_BINDIR}) set(QLITEHTML_LIBRARY_PATH ${INSTALL_LIBDIR}) set(QLITEHTML_LIBRARY_TYPE STATIC) set(BUILD_SHARED_LIBS OFF) +if(QT_FEATURE_static_runtime AND MSVC) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") +endif() add_subdirectory(qlitehtml/src EXCLUDE_FROM_ALL) if(TARGET qlitehtml) qt_autogen_tools_initial_setup(qlitehtml) |