From 7f747465d4c4ee4170e6043a8fbf5035cc256aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Wed, 30 Dec 2020 00:23:22 +0100 Subject: M!62 - GObjectIntrospection.cmake: Specify the `sources-top-dirs` Requires GObject Introspection >=1.59.1 Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/284 Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/62 --- cmake/modules/GObjectIntrospection.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake index c9fad7e98..1ebf42d83 100644 --- a/cmake/modules/GObjectIntrospection.cmake +++ b/cmake/modules/GObjectIntrospection.cmake @@ -16,7 +16,7 @@ include(CMakeParseArguments) add_printable_option(ENABLE_INTROSPECTION "Enable GObject introspection" OFF) if(ENABLE_INTROSPECTION) - pkg_check_modules_for_option(ENABLE_INTROSPECTION "GObject introspection" GOBJECT_INTROSPECTION gobject-introspection-1.0) + pkg_check_modules_for_option(ENABLE_INTROSPECTION "GObject introspection" GOBJECT_INTROSPECTION gobject-introspection-1.0>=1.59.1) pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner) pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler) @@ -138,6 +138,8 @@ macro(gir_add_introspection gir) --filelist=${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files --output ${CMAKE_CURRENT_BINARY_DIR}/${gir} --accept-unprefixed + --sources-top-dirs=${CMAKE_SOURCE_DIR} + --sources-top-dirs=${CMAKE_BINARY_DIR} DEPENDS ${${${_gir_name}_FILES}} ${${_gir_name}_LIBS} ${${_gir_name}_DEPS} -- cgit v1.2.1