Commit 3cc7bdd1 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

cmake: Modern way to link to zlib

parent 3129b642
......@@ -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
......
......@@ -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} )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment