[poppler] 2 commits - glib/CMakeLists.txt

[Pino Toscano]

 glib/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dcbc9686d97f4f6596c43d1f701207278c25f8eb
Author: Pino Toscano <pino at kde.org>
Date:   Mon Nov 26 14:44:21 2012 +0100

    glib/cmake: Include Gio-2.0 for introspection
    
    Fixes g-ir-scanner warnings:
    poppler-document.cc:257: Warning: Poppler: poppler_document_new_from_stream: argument stream: Unresolved type: 'GInputStream*'
    poppler-document.cc:257: Warning: Poppler: poppler_document_new_from_stream: argument cancellable: Unresolved type: 'GCancellable*'
    poppler-document.cc:315: Warning: Poppler: poppler_document_new_from_gfile: argument file: Unresolved type: 'GFile*'
    poppler-document.cc:315: Warning: Poppler: poppler_document_new_from_gfile: argument cancellable: Unresolved type: 'GCancellable*'
    
    https://bugs.freedesktop.org/show_bug.cgi?id=56218
    
    folloup of c84753e12029fcc6113f80dedc9a943ce1deb214

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 4d71ed2..b07b358 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -110,7 +110,7 @@ if (HAVE_INTROSPECTION)
 
   set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})
   set(Poppler_0_18_gir "poppler-glib")
-  set(Poppler_0_18_gir_INCLUDES GObject-2.0 cairo-1.0)
+  set(Poppler_0_18_gir_INCLUDES GObject-2.0 Gio-2.0 cairo-1.0)
   get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
   _list_prefix(_includes _tmp_includes "-I")
   set(Poppler_0_18_gir_CFLAGS ${_includes})
commit 169e4cb001fa235ca608d3d0b42ea4214161fc2d
Author: Pino Toscano <pino at kde.org>
Date:   Mon Nov 26 14:42:59 2012 +0100

    glib/cmake: Show all suppressed introspection scanner warnings
    
    https://bugs.freedesktop.org/show_bug.cgi?id=56218
    
    followup of 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index a6f1e89..4d71ed2 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -105,7 +105,7 @@ endmacro(_list_prefix)
 if (HAVE_INTROSPECTION)
   include(GObjectIntrospectionMacros)
   set(INTROSPECTION_GIRS)
-  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}")
+  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR} --warn-all")
   set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
 
   set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})