diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2020-12-30 00:23:22 +0100 |
|---|---|---|
| committer | Corentin Noël <corentin.noel@collabora.com> | 2021-01-04 18:09:25 +0100 |
| commit | 7f747465d4c4ee4170e6043a8fbf5035cc256aaf (patch) | |
| tree | 9ff481f4e30b952150ac2c3e001238d73f7aead4 | |
| parent | 043eebcabcc0ba9428ca0fc3d30ba195da87fe63 (diff) | |
| download | evolution-data-server-tintou/source-path.tar.gz | |
M!62 - GObjectIntrospection.cmake: Specify the `sources-top-dirs`tintou/source-path
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
| -rw-r--r-- | cmake/modules/GObjectIntrospection.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
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} |