[glib/meson-for-merge] meson: fix remaining wrong #include's for gdbus_codegen files
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/meson-for-merge] meson: fix remaining wrong #include's for gdbus_codegen files
- Date: Fri, 14 Jul 2017 13:20:47 +0000 (UTC)
commit be8820128faf1eb466ad896afd6133c8e5092156
Author: Thibault Saunier <thibault saunier osg samsung com>
Date: Thu Jul 13 22:22:16 2017 -0400
meson: fix remaining wrong #include's for gdbus_codegen files
This is a follow up on 266bc1e510e154f7b5e793adb227d979ae655446
to fix building tests and examples when using GLib as a meson
subproject.
gio/tests/gdbus-object-manager-example/meson.build | 5 +++--
gio/tests/meson.build | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gio/tests/gdbus-object-manager-example/meson.build
b/gio/tests/gdbus-object-manager-example/meson.build
index a5cff0c..6303573 100644
--- a/gio/tests/gdbus-object-manager-example/meson.build
+++ b/gio/tests/gdbus-object-manager-example/meson.build
@@ -9,8 +9,9 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
'--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
'--c-namespace', 'Example',
'--c-generate-object-manager',
- '--generate-c-code', '@OUTDIR@/gdbus-example-objectmanager-generated',
- '--generate-docbook', '@OUTDIR@/gdbus-example-objectmanager-generated',
+ '--output-directory', '@OUTDIR@',
+ '--generate-c-code', 'gdbus-example-objectmanager-generated',
+ '--generate-docbook', 'gdbus-example-objectmanager-generated',
'@INPUT@'])
libgdbus_example_objectmanager = shared_library('libgdbus-example-objectmanager',
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 754e3ae..0967f14 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -135,7 +135,8 @@ if host_machine.system() != 'windows'
'gdbus-test-codegen-generated.c'],
command : [python, gdbus_codegen,
'--interface-prefix', 'org.project.',
- '--generate-c-code', '@OUTDIR@/gdbus-test-codegen-generated',
+ '--output-directory', '@OUTDIR@',
+ '--generate-c-code', 'gdbus-test-codegen-generated',
'--c-generate-object-manager',
'--c-namespace', 'Foo_iGen',
'--generate-docbook', 'gdbus-test-codegen-generated-doc',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]