diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-14 15:54:50 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-22 14:07:38 +0000 |
| commit | 7948b4c84d2fa03718125f221608750ebc977be2 (patch) | |
| tree | bb285467d6ff825a4356f9af56b2359a3932a74c | |
| parent | 857cc62a82b6e003d30a2280ad77c71ffbd06307 (diff) | |
| download | qtsvg-7948b4c84d2fa03718125f221608750ebc977be2.tar.gz | |
CMake: Adapt to new WrapZLIB package
Change-Id: I9ec888e4d5d8699c2f35fac386b35de5ab72319a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 618990cf06aa7664402d5a16793f760a60696c89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/svg/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index 1d3b23e..f130c5a 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -8,8 +8,8 @@ # Handle the conditional finding of either system zlib or qt zlib. if(NOT QT_FEATURE_system_zlib) find_package(Qt6 COMPONENTS Zlib) -elseif(NOT TARGET ZLIB::ZLIB) - qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB) +elseif(NOT TARGET WrapZLIB::WrapZLIB) + qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB) endif() # special case end @@ -60,7 +60,7 @@ qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUA qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib LIBRARIES - ZLIB::ZLIB + WrapZLIB::WrapZLIB ) qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib |