diff options
| author | Slávek Banko <[email protected]> | 2015-08-30 14:23:37 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-08-30 14:26:13 +0200 |
| commit | 417b842fa3d30ca5f20431683e17d89e907e1175 (patch) | |
| tree | 2b9177f56f84bba1625d83d31b7001a23835ebcd | |
| parent | 12ec5cf47c6b23c3b59777d3cee8768d12413f0b (diff) | |
| download | tdegraphics-417b842fa3d30ca5f20431683e17d89e907e1175.tar.gz tdegraphics-417b842fa3d30ca5f20431683e17d89e907e1175.zip | |
Fix poppler include in configure checks and link library path
This resolves Bug 2489
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit ac4aa21a129316b9cf2a6785ad9ae1985b199981)
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 6 |
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 ) |