[evolution-data-server/tintou/source-path: 2/2] M!62 - GObjectIntrospection.cmake: Specify the `sources-top-dirs`
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/tintou/source-path: 2/2] M!62 - GObjectIntrospection.cmake: Specify the `sources-top-dirs`
- Date: Tue, 5 Jan 2021 09:53:06 +0000 (UTC)
commit b38748492c2dfe02649b6a8996ab4c591d289c3f
Author: Corentin Noël <corentin noel collabora com>
Date: Wed Dec 30 00:23:22 2020 +0100
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}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]