diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-01-31 16:43:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-01-31 18:16:48 +0100 |
| commit | 381994598546131f262a3abac7fbcc325acfc7b5 (patch) | |
| tree | a8b0b9770d49d1e507899394e7f996bed0e5a34e | |
| parent | dfe5cd7985d84d467184da9a6558e9affcf45866 (diff) | |
| download | qtimageformats-381994598546131f262a3abac7fbcc325acfc7b5.tar.gz | |
CMake: Fix Threads::Threads global target promotion issue
Pick-to: 6.5
Fixes: QTBUG-110720
Change-Id: I064cab7afa662a53fe70938023aa7e994f1b7b84
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -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) |