Fix poppler include in configure checks and link library path

This resolves Bug 2489

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ac4aa21a12)
r14.0.x
Slávek Banko 9 years ago
parent 12ec5cf47c
commit 417b842fa3

@ -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}
)

@ -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 )

Loading…
Cancel
Save