the plucker generators requires, libjpeg, so compile it only if libjpeg is found

use the right cmake variables instead of hardcoding the library name

svn path=/trunk/playground/graphics/okular/; revision=642611
This commit is contained in:
Pino Toscano 2007-03-14 21:00:15 +00:00
parent 427f632da1
commit e321010e63
2 changed files with 7 additions and 2 deletions

View file

@ -5,6 +5,7 @@ macro_optional_find_package(CHM)
macro_optional_find_package(DjVuLibre)
macro_optional_find_package(TIFF)
macro_optional_find_package(Freetype)
macro_optional_find_package(JPEG)
# let's enable the generators properly configured
@ -46,9 +47,12 @@ add_subdirectory(fictionbook)
add_subdirectory(comicbook)
add_subdirectory(plucker)
if(JPEG_FOUND)
add_subdirectory(plucker)
endif(JPEG_FOUND)
macro_log_feature(POPPLER_FOUND "Poppler-Qt4" "Support for PDF files in okular" "http://poppler.freedesktop.org" FALSE "0.5.4" "")
macro_log_feature(CHM_FOUND "libCHM" "Support for CHM files in okular" "http://morte.jedrea.com/~jedwin/projects/chmlib" FALSE "" "")
macro_log_feature(DJVULIBRE_FOUND "libdjvulibre" "Support for DjVu files in okular" "http://djvulibre.djvuzone.org" FALSE "3.5.17" "")
macro_log_feature(TIFF_FOUND "libTIFF" "Support for TIFF files in okular" "http://www.remotesensing.org/libtiff/" FALSE "" "")
macro_log_feature(JPEG_FOUND "JPEG" "Support for PalmDB docments in okular" "http://www.ijg.org/" FALSE "" "")

View file

@ -2,6 +2,7 @@ include_directories(
${CMAKE_BINARY_DIR}/okular
${CMAKE_SOURCE_DIR}/okular
${CMAKE_SOURCE_DIR}/okular/generators/plucker/unpluck
${JPEG_INCLUDE_DIR}
)
set(qunpluck_SRCS
@ -22,7 +23,7 @@ kde4_automoc(${okularGenerator_plucker_SRCS})
kde4_add_plugin(okularGenerator_plucker WITH_PREFIX ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
target_link_libraries(okularGenerator_plucker okularcore ${KDE4_KDEPRINT_LIBS} m jpeg )
target_link_libraries(okularGenerator_plucker okularcore ${KDE4_KDEPRINT_LIBS} m ${JPEG_LIBRARIES} )
install(TARGETS okularGenerator_plucker DESTINATION ${PLUGIN_INSTALL_DIR})