diff options
| -rw-r--r-- | cmake/FindWrapLibClang.cmake | 1 | ||||
| -rw-r--r-- | configure.cmake | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/FindWrapLibClang.cmake b/cmake/FindWrapLibClang.cmake index 91133be06..51afea0f1 100644 --- a/cmake/FindWrapLibClang.cmake +++ b/cmake/FindWrapLibClang.cmake @@ -53,6 +53,7 @@ if(TARGET libclang AND TARGET clangHandleCXX AND __wrap_lib_clang_requested_vers if (NOT TARGET Threads::Threads) find_package(Threads) endif() + qt_internal_disable_find_package_global_promotion(Threads::Threads) target_link_libraries(WrapLibClang::WrapLibClang INTERFACE libclang clangHandleCXX Threads::Threads) 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) |