summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-05-06 18:31:34 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-05-06 18:31:34 -0500
commit5077913f281976bb69e0497b682b320f1d01a08e (patch)
treef7a5307a483fcd937508a22bf9f12f17e8e6ac9c
parent0efb8a18d45f2432c9c796aa5ef7af3f124967ea (diff)
downloadtdegraphics-5077913f281976bb69e0497b682b320f1d01a08e.tar.gz
tdegraphics-5077913f281976bb69e0497b682b320f1d01a08e.zip
Replace fixed hard-coding of poppler include directory with cmake variable.
Thanks to Francois Andriot.
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt2
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake10
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 8765e378..d07e8134 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" )