diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-12 17:43:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-12 18:18:58 +0000 |
| commit | bf0ee8c4e8d831151ee882f8491a30d1eee6558b (patch) | |
| tree | 74b75d9fd3163e154ba0b564119fe8dd14e4f16d | |
| parent | fbfa067a304e8aea6ba6719395fd12a05688b6f8 (diff) | |
Fix the 'Fix static builds' commit
The GlobalConfigPrivate target should also be filtered out when
registering target dependencies, because there's no standalone
Qt5GlobalConfigPrivate.cmake file.
Amends fbfa067a304e8aea6ba6719395fd12a05688b6f8.
Change-Id: If89732bc2fd004b9644959f71339e22210483d7c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 3058e22bb5..9f358d164d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -769,7 +769,9 @@ function(qt_register_target_dependencies target public_libs private_libs) foreach(lib IN LISTS public_libs private_libs) if ("${lib}" MATCHES "^Qt::(.*)") set(lib "${CMAKE_MATCH_1}") - if (lib STREQUAL Platform OR lib STREQUAL GlobalConfig + if (lib STREQUAL Platform + OR lib STREQUAL GlobalConfig + OR lib STREQUAL GlobalConfigPrivate OR lib STREQUAL PlatformModuleInternal OR lib STREQUAL PlatformPluginInternal OR lib STREQUAL PlatformToolInternal) |