Replace fixed hard-coding of poppler include directory with cmake variable.

Thanks to Francois Andriot.
pull/1/head
Darrell Anderson 12 years ago
parent 0efb8a18d4
commit 5077913f28

@ -21,7 +21,7 @@ include_directories(
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
/usr/include/poppler
${POPPLER_INCLUDE_DIRS}
)
link_directories(

@ -1,3 +1,13 @@
# Poppler
if( BUILD_KPDF )
pkg_search_module( POPPLER poppler )
if( POPPLER_FOUND )
set( HAVE_POPPLER 1 )
else( )
tde_message_fatal( "poppler is required, but was not found on your system" )
endif( )
endif( )
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} "-lpoppler" )

Loading…
Cancel
Save