the plucker generator uss also zlib, so look for and link to it

issue found by the Debian packager Modestas Vainius, thanks!

svn path=/trunk/KDE/kdegraphics/okular/; revision=799258
This commit is contained in:
Pino Toscano 2008-04-20 22:21:20 +00:00
parent eaea89500f
commit 33fabf80b4
2 changed files with 6 additions and 3 deletions

View file

@ -23,6 +23,8 @@ macro_log_feature(FREETYPE_FOUND "FreeType" "A font rendering engine" "http://ww
#we look for JPEG in kdegraphics/CMakeLists.txt
#macro_optional_find_package(JPEG)
#macro_log_feature(JPEG_FOUND "JPEG" "A library for reading and writing JPEG image files." "http://www.ijg.org" FALSE "" "Support fof PalmDB documents in okular.")
macro_optional_find_package(ZLIB)
macro_log_feature(ZLIB_FOUND "zlib" "The zlib library" "http://www.zlib.net" FALSE "" "Support for Plucker files in Okular.")
macro_optional_find_package(EPub)
macro_log_feature(EPUB_FOUND "libepub" "A library for reading EPub documents" "http://sourceforge.net/projects/ebook-tools" FALSE "" "Support for EPub documents in Okular.")
@ -61,9 +63,9 @@ add_subdirectory(fictionbook)
add_subdirectory(comicbook)
if(JPEG_FOUND)
if(JPEG_FOUND AND ZLIB_FOUND)
add_subdirectory(plucker)
endif(JPEG_FOUND)
endif(JPEG_FOUND AND ZLIB_FOUND)
if(EPUB_FOUND)
add_subdirectory(epub)

View file

@ -3,6 +3,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
${CMAKE_CURRENT_SOURCE_DIR}/../../generators/plucker/unpluck
${JPEG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
)
set(qunpluck_SRCS
@ -22,7 +23,7 @@ set(okularGenerator_plucker_SRCS
kde4_add_plugin(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
target_link_libraries(okularGenerator_plucker okularcore ${KDE4_KIO_LIBS} ${MATH_LIB} ${JPEG_LIBRARY} )
target_link_libraries(okularGenerator_plucker okularcore ${KDE4_KIO_LIBS} ${MATH_LIB} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
install(TARGETS okularGenerator_plucker DESTINATION ${PLUGIN_INSTALL_DIR})