diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-06 18:31:34 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 19:30:10 +0200 |
| commit | 7fa9aee16352cd1bbec16b0c876acefa5f9922f6 (patch) | |
| tree | 3d878488e1466e7372de78023fdc9ac8968d3727 | |
| parent | a2ce1572ad5512ef88d6edd96ed95b436534177d (diff) | |
| download | tdegraphics-7fa9aee16352cd1bbec16b0c876acefa5f9922f6.tar.gz tdegraphics-7fa9aee16352cd1bbec16b0c876acefa5f9922f6.zip | |
Replace fixed hard-coding of poppler include directory with cmake variable.
Thanks to Francois Andriot.
(cherry picked from commit 5077913f281976bb69e0497b682b320f1d01a08e)
| -rw-r--r-- | kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt index 23638219..07d422db 100644 --- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt +++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt @@ -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( diff --git a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 2401f44d..2242eed0 100644 --- a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -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" ) |