summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-08-30 14:23:37 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-08-30 14:25:02 +0200
commitac4aa21a129316b9cf2a6785ad9ae1985b199981 (patch)
tree995b729681ffe69bdd4ffb942da108fb7c1b70a1
parent9114863a54388a7fa7845b812f6449bc46a05688 (diff)
downloadtdegraphics-ac4aa21a.tar.gz
tdegraphics-ac4aa21a.zip
Fix poppler include in configure checks and link library path
This resolves Bug 2489 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt3
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake6
2 files changed, 5 insertions, 4 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
index 26e87e1c..2ce99412 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
@@ -26,6 +26,7 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
+ ${POPPLER_LIBRARY_DIRS}
)
##### pc files ##################################
@@ -49,6 +50,6 @@ tde_add_library( poppler-tqt SHARED AUTOMOC
poppler-page-transition.cc poppler-page-transition-private.h
poppler-private.cc poppler-private.h
VERSION 0.0.0
- LINK poppler ${TQT_LIBRARIES}
+ LINK ${POPPLER_LIBRARIES} ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index 667cb317..7714f5e3 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -10,16 +10,16 @@ tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
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>
+ #include <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); } "
HAVE_POPPLER_016 )
check_cxx_source_compiles("
- #include <poppler/PSOutputDev.h>
+ #include <PSOutputDev.h>
int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, 0, 0, psModePS, a, b); } "
HAVE_POPPLER_020 )
check_cxx_source_compiles("
#include <vector>
- #include <poppler/PSOutputDev.h>
+ #include <PSOutputDev.h>
int main(int, char**) { int a; int b; std::vector<int> p; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, p, psModePS, a, b); } "
HAVE_POPPLER_030 )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )