diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-02-29 07:30:40 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-29 13:46:00 +0000 |
| commit | 71353d97723bf981f2247b70e09195daa66bea73 (patch) | |
| tree | bf2860a2ecf369dc62a11448f6cf3e8a5036fedd | |
| parent | 19105d3ac2905f8dd21eab051bf4f3bf771ea02c (diff) | |
Avoid promoting WrapLibYaml to global in configure.cmake
Pick-to: 6.6
Change-Id: Ib359259a675689efa82ef42728f3ea7f25c9cc51
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 076b2cf8a6fb7ab08c4d10e8aa0112385c293076)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/common-lib/configure.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common-lib/configure.cmake b/src/common-lib/configure.cmake index b82b243e..c33f6ba2 100644 --- a/src/common-lib/configure.cmake +++ b/src/common-lib/configure.cmake @@ -17,6 +17,9 @@ set_property(CACHE INPUT_libarchive PROPERTY STRINGS undefined qt system) #### Libraries +if(TARGET WrapLibYaml::WrapLibYaml) + qt_internal_disable_find_package_global_promotion(WrapLibYaml::WrapLibYaml) +endif() qt_find_package(WrapLibYaml PROVIDED_TARGETS WrapLibYaml::WrapLibYaml MODULE_NAME appman_common QMAKE_LIB yaml) qt_find_package(WrapLibArchive PROVIDED_TARGETS WrapLibArchive::WrapLibArchive MODULE_NAME appman_package QMAKE_LIB archive) |