cmake/modules/GObjectIntrospectionMacros.cmake | 2 ++ glib/CMakeLists.txt | 3 +++ 2 files changed, 5 insertions(+)
New commits: commit 9548573a16629fecdbd44c9aac8b626ec6f53b81 Author: Pino Toscano <[email protected]> Date: Mon Jan 30 00:32:52 2012 +0100 glib/cmake: various minor introspection improvements "port" to CMake of the automake equivalents of 4765c3289635fe4fb006e7df4f83d7056eb42855 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index edc22f1..bc46b4d 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -117,8 +117,11 @@ if (HAVE_INTROSPECTION) list(APPEND _abs_introspection_files ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h ) set(Poppler_0_18_gir_FILES ${_abs_introspection_files}) + set(Poppler_0_18_gir_SCANNERFLAGS --c-include poppler.h) + set(Poppler_0_18_gir_EXPORT_PACKAGES poppler-glib) list(APPEND INTROSPECTION_GIRS Poppler-0.18.gir) commit bf2ffb1cc76bcf569419ac495f524c41bb6f1650 Author: Pino Toscano <[email protected]> Date: Mon Jan 30 00:21:31 2012 +0100 cmake: support $(gir_name)_EXPORT_PACKAGES for g-ir-scanner diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake index e7d62a3..3f90c2a 100644 --- a/cmake/modules/GObjectIntrospectionMacros.cmake +++ b/cmake/modules/GObjectIntrospectionMacros.cmake @@ -45,6 +45,7 @@ macro(gir_add_introspections introspections_girs) _gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=") _gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=") _gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=") + _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=") # Reuse the LIBTOOL variable from by automake if it's set set(_gir_libtool "--no-libtool") @@ -59,6 +60,7 @@ macro(gir_add_introspections introspections_girs) ${_gir_libraries} ${_gir_packages} ${_gir_includes} + ${_gir_export_packages} ${${_gir_name}_SCANNERFLAGS} ${${_gir_name}_CFLAGS} ${${_gir_name}_FILES} _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
