diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-01-31 16:43:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-31 17:58:49 +0000 |
| commit | c6ce3d613833989706b15340ad0126fb2ed0a617 (patch) | |
| tree | cb0e92cf01858010f556a92fb4b777d8719223d5 | |
| parent | 504ae08a4070ffc226c8f46bc5b2a15a2e4870f6 (diff) | |
CMake: Fix Threads::Threads global target promotion issue
Fixes: QTBUG-110720
Change-Id: I064cab7afa662a53fe70938023aa7e994f1b7b84
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 381994598546131f262a3abac7fbcc325acfc7b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/imageformats/configure.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imageformats/configure.cmake b/src/imageformats/configure.cmake index 9e618a8..2896b3f 100644 --- a/src/imageformats/configure.cmake +++ b/src/imageformats/configure.cmake @@ -19,6 +19,12 @@ set_property(CACHE INPUT_webp PROPERTY STRINGS undefined no qt system) qt_find_package(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper MODULE_NAME imageformats QMAKE_LIB jasper) qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF MODULE_NAME imageformats QMAKE_LIB tiff) +# Threads::Threads might be brought in via a top-level CMakeLists.txt find_package dependency +# in which case if the system WebpConfig.cmake depends Threads, it shouldn't try to promote it to +# global to avoid a 'global promotion of a target in a different subdirectory' error. +if(TARGET Threads::Threads) + qt_internal_disable_find_package_global_promotion(Threads::Threads) +endif() qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME imageformats QMAKE_LIB webp) qt_find_package(Libmng PROVIDED_TARGETS Libmng::Libmng MODULE_NAME imageformats QMAKE_LIB mng) |