diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-23 12:29:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-02 14:06:23 +0000 |
| commit | ffb076783a1e0706350d80fc3f2ac2800f911b6c (patch) | |
| tree | 7d5f56664492213c08ceeac6dcc9cf44280aa3f8 /configure.cmake | |
| parent | 6bf483098838d7aee9c92c2d0552d84c5a2140eb (diff) | |
CMake: Rename FindZSTD to FindWrapZSTD
And the target ZSTD::ZSTD to WrapZSTD::WrapZSTD.
This should allow building Qt with the
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON set.
Fixes: QTBUG-100537
Change-Id: I748601e4ad6f518323bf1034d6fc1de582c815e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 34a4fe01663c3d8b193e42c6609e75c431f8a897)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index a4cde1e901..44b0cb7f51 100644 --- a/configure.cmake +++ b/configure.cmake @@ -17,7 +17,7 @@ if(TARGET ZLIB::ZLIB) endif() # special case end -qt_find_package(ZSTD 1.3 PROVIDED_TARGETS ZSTD::ZSTD MODULE_NAME global QMAKE_LIB zstd) +qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME global QMAKE_LIB zstd) qt_find_package(WrapDBus1 1.2 PROVIDED_TARGETS dbus-1 MODULE_NAME global QMAKE_LIB dbus) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev MODULE_NAME global QMAKE_LIB libudev) @@ -889,7 +889,7 @@ qt_feature("system-zlib" PRIVATE ) qt_feature("zstd" PRIVATE LABEL "Zstandard support" - CONDITION ZSTD_FOUND + CONDITION WrapZSTD_FOUND ) qt_feature("stdlib-libcpp" PRIVATE LABEL "Using stdlib=libc++" |