office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Modern way to link to zlib

Browse source
This commit is contained in:
Albert Astals Cid 2020-12-02 18:57:49 +01:00
parent 3129b642f9
commit 3cc7bdd1d7
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -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

3
generators/plucker/CMakeLists.txt
View file

@ -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} )