summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-14 09:32:22 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-10-14 19:43:39 +0200
commit5b6949187629a6b7b1a721062cd7bcc6f5c15ab6 (patch)
tree375ae3f89ff67093004bf1cb92dd7f093e697bc1
parent43697b13de0e13e7ad64da6a119abf2f7a075c58 (diff)
downloadtdegraphics-5b6949187629a6b7b1a721062cd7bcc6f5c15ab6.tar.gz
tdegraphics-5b6949187629a6b7b1a721062cd7bcc6f5c15ab6.zip
Use poppler pkg-config information when running version checks
(cherry picked from commit 03e9329656db37001866d8d225942604f23c8dd9)
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index eab7a0a9..99786378 100644
--- a/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -9,8 +9,8 @@ if( BUILD_KPDF )
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" )
+set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS})
+set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ${POPPLER_LDFLAGS} )
check_cxx_source_compiles("
#include <poppler/PSOutputDev.h>
int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, (XRef*)0, (Catalog*)0, NULL, 0, 0, psModePS, a, b); } "