diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-14 15:56:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-22 13:20:57 +0000 |
| commit | 5b1a5f5a1a25c2d77e2e7b4dde25a939c311d9e8 (patch) | |
| tree | 281236438a2a3db63dfcb6ab344762bcb19362de | |
| parent | 41d94fb4b7b54751fbd2a6ca9475b7b00556ae28 (diff) | |
| download | qtimageformats-5b1a5f5a1a25c2d77e2e7b4dde25a939c311d9e8.tar.gz | |
CMake: Adapt to new WrapZLIB package
Change-Id: I9b43b627c834a4eead2f02ee273ccadd92d69fa0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 08bcf061e10adcdd9abf6df702ca76d9475d143c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/imageformats/tiff/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt index a5cd211..135eb64 100644 --- a/src/plugins/imageformats/tiff/CMakeLists.txt +++ b/src/plugins/imageformats/tiff/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 @@ -93,7 +93,7 @@ qt_internal_extend_target(QTiffPlugin CONDITION ANDROID AND NOT QT_FEATURE_syste qt_internal_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff LIBRARIES - ZLIB::ZLIB + WrapZLIB::WrapZLIB ) qt_internal_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib |