From 3cc7bdd1d78c31f86e5b4e437fa60f66a5044e2d Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Wed, 2 Dec 2020 18:57:49 +0100
Subject: [PATCH] cmake: Modern way to link to zlib

---
 CMakeLists.txt                    | 4 ++--
 generators/plucker/CMakeLists.txt | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2078da99..7bcb8be9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x050C00)
 add_definitions(-DKF_DEPRECATED_WARNINGS_SINCE=0x054400)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${CMAKE_BINARY_DIR}/core)
 
 if(BUILD_MOBILE)
     add_subdirectory( mobile )
@@ -309,7 +309,7 @@ PRIVATE
     KF5::Bookmarks
     Phonon::phonon4qt5
     ${MATH_LIB}
-    ${ZLIB_LIBRARIES}
+    ZLIB::ZLIB
 PUBLIC  # these are included from the installed headers
     KF5::CoreAddons
     KF5::XmlGui
diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt
index 4066d2043..4b19efa75 100644
--- a/generators/plucker/CMakeLists.txt
+++ b/generators/plucker/CMakeLists.txt
@@ -4,7 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_plucker")
 include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/../..
    ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/plucker/unpluck
-   ${ZLIB_INCLUDE_DIR}
 )
 
 set(qunpluck_SRCS
@@ -23,7 +22,7 @@ set(okularGenerator_plucker_SRCS
 
 okular_add_generator(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
 
-target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore KF5::I18n ${MATH_LIB} JPEG::JPEG ${ZLIB_LIBRARY})
+target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore KF5::I18n ${MATH_LIB} JPEG::JPEG ZLIB::ZLIB)
 
 ########### install files ###############
 install( FILES okularPlucker.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )