diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-13 17:23:20 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-13 21:36:43 +0200 |
| commit | af64f2f8ab11088a71b0e153df60ddae361b1a3a (patch) | |
| tree | cbfac40fc9c1214a05f20db19e822f75b54d1ced /configure.cmake | |
| parent | 95cab331a4dded798ab9b476d4d06c5e1f77dcfb (diff) | |
CMake: Temporarily don't promote WrapLibClang to global scope
After 92ee9bd6b885879090ba57e49c8bd84a06d42b2b in qtbase, if
LLVM_INSTALL_DIR is provided when configuring qttools, the
configuration would fail trying to promote Threads::Threads to global
scope.
Temporarily remove the PROVIDED_TARGETS argument remove the automatic
propagation of the target to global scope, thus avoiding the issue.
A better fix will be integrated once a new change is merged to qtbase
and we can use the new API for opting out of global promotion.
Task-number: QTBUG-85877
Change-Id: I644ee28336c0bf7d8f89ebb2eff0a300c0851a4c
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.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 5f5d6bd60..a9192d495 100644 --- a/configure.cmake +++ b/configure.cmake @@ -16,8 +16,10 @@ # 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) # special case end -qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang) # special case if(TARGET WrapLibClang::WrapLibClang) set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE) |