diff options
author | Yuhang Zhao <[email protected]> | 2023-10-08 09:38:41 +0800 |
---|---|---|
committer | Yuhang Zhao <[email protected]> | 2023-10-09 13:48:01 +0800 |
commit | d9820b02072b27f830b389e503467c8220679cba (patch) | |
tree | 7b018fa5c3cff4a01c813e8d0ccaee2f7612d3b3 | |
parent | 4ba7081b6673d8f53a76d037da2822b89cd3bfcf (diff) |
cmake: un-special case clang-cl for runtimeobject
clang-cl can correctly handle runtimeobject.lib for quite some time
already, no need to special case for it anymore.
Change-Id: I87aa98134ad847808b3129c5629ccf8fa1dce253
Reviewed-by: Thiago Macieira <[email protected]>
-rw-r--r-- | src/corelib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/networkinformation/networklistmanager/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 57bb456f21a..b52c994c5e4 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -806,7 +806,7 @@ qt_internal_extend_target(Core CONDITION WIN32 ) # On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it) -qt_internal_extend_target(Core CONDITION WIN32 AND MSVC AND NOT CLANG +qt_internal_extend_target(Core CONDITION MSVC LIBRARIES runtimeobject ) diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index a9acc465f36..f15eedf866b 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin Qt::NetworkPrivate ) -qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG +qt_internal_extend_target(QNLMNIPlugin CONDITION MSVC LIBRARIES runtimeobject oleaut32 |