summaryrefslogtreecommitdiff
path: root/configure.cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-08-13 17:25:52 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-08-25 17:47:46 +0200
commitf2657421c926702604ed08d34d1b7a1449283e27 (patch)
treee15f3b87f3943d3e82f6d25493f90c00c6d2f9cf /configure.cmake
parentd7e89a71bbbb50122b8175886eed7bdf8a2f6c8d (diff)
downloadqttools-f2657421c926702604ed08d34d1b7a1449283e27.tar.gz
CMake: Disable global promotion of Threads target using new API
Revert the previous temporary fix, and use the new API for excluding Threads target from global promotion, thus avoid a configuration error. Task-number: QTBUG-85877 Change-Id: If09d84f7deab07ec20581612d3f29143851f6fdb Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake
index 432eeaeaf..d0a64ea0f 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -16,9 +16,7 @@
# Presumably because 6.0 ClangConfig.cmake files are not good enough?
# In any case explicitly request a minimum version of 8.x for now, otherwise
# building with CMake will fail at compilation time.
-# FIXME: Temporarily don't provide the targets, to circumevent a global promotion issue
-# regarding Threads::Threads.
-qt_find_package(WrapLibClang 8)
+qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang)
# special case end
if(TARGET WrapLibClang::WrapLibClang)