Attachment 611 Details for Bug 993 – kdegraphics 3.5.13 : fix poppler detection with cmake macros

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] kdegraphics 3.5.13 : fix poppler detection with cmake macros

kdegraphics-3.5.13-fix_poppler_support.patch (text/plain), 1.12 KB, created by Francois Andriot on 2012-05-06 12:29:37 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2012-05-06 12:29:37 CDT

Size: 1.12 KB

patch

obsolete

>--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake.ORI	2012-05-06 19:23:47.668667462 +0200
>+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake	2012-05-06 19:21:43.311268611 +0200
>@@ -1,3 +1,13 @@
>+# Poppler
>+if( BUILD_KPDF )
>+  pkg_search_module( POPPLER poppler )
>+  if( POPPLER_FOUND )
>+    set( HAVE_POPPLER 1 )
>+  else( )
>+    tde_message_fatal( "poppler is required, but was not found on your system" )
>+  endif( )
>+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" )
>--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI	2012-05-06 19:24:31.405752482 +0200
>+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt	2012-05-06 19:22:12.544657204 +0200
>@@ -21,7 +21,7 @@
>   ${TDE_INCLUDE_DIR}
>   ${TQT_INCLUDE_DIRS}
>   ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
>-  /usr/include/poppler
>+  ${POPPLER_INCLUDE_DIRS}
> )
> 
> link_directories(

Actions: View | Diff

Attachments on bug 993: 611