Attachment 2543 Details for Bug 2489 – Fix poppler include in configure checks and link library path

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix poppler include in configure checks and link library path

fix-poppler-include-in-configure-checks.diff (text/plain), 2.00 KB, created by Slávek Banko on 2015-07-31 02:23:43 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2015-07-31 02:23:43 CDT

Size: 2.00 KB

patch

obsolete

>Index: b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
>===================================================================
>--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
>+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
>@@ -10,16 +10,16 @@
> 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 )
>Index: b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
>===================================================================
>--- a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
>+++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt
>@@ -26,6 +26,7 @@
> 
> link_directories(
>   ${TQT_LIBRARY_DIRS}
>+  ${POPPLER_LIBRARY_DIRS}
> )
> 
> ##### pc files ##################################
>@@ -49,6 +50,6 @@
>     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}
> )

Actions: View | Diff

Attachments on bug 2489: 2542 | 2543