diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2017-07-12 16:15:38 +1000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-13 19:03:39 -0400 |
| commit | 266bc1e510e154f7b5e793adb227d979ae655446 (patch) | |
| tree | 77bebfe23718641c7c2791f0d33e43c8bdb31e76 | |
| parent | dbf0a566703586db9777c3d56e01aa40c02ab9ac (diff) | |
| download | glib-266bc1e510e154f7b5e793adb227d979ae655446.tar.gz | |
meson: fix wrong #include's for gdbus_codegen files
When building glib as a subproject, #include's for xdp-dbus.h from xdp-dbus.c
and for gdbus-daemon-generated.h from gdbus-daemon-generated.c were generated as
being prefixed with the subproject prefix, eg
#include "subproject/glib/gio/gdbus-daemon-generated.h".
That failed since the root of the build directory is obviously not part of the
include path when building a subproject.
Passing --output-directory @OUTDIR@ to gdbus-codegen and removing @OUTDIR@ from
--generate-c-code fixes the issue.
| -rw-r--r-- | gio/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gio/meson.build b/gio/meson.build index 31153bb1f..1fb3a5304 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -175,7 +175,8 @@ xdp_dbus_generated = custom_target('xdp-dbus', output : ['xdp-dbus.h', 'xdp-dbus.c'], command : [python, gdbus_codegen, '--interface-prefix', 'org.freedesktop.portal.', - '--generate-c-code', '@OUTDIR@/xdp-dbus', + '--output-directory', '@OUTDIR@', + '--generate-c-code', 'xdp-dbus', '--c-namespace', 'GXdp', '--annotate', 'org.freedesktop.portal.Documents.Add()', 'org.gtk.GDBus.C.UnixFD', 'true', @@ -189,7 +190,8 @@ gdbus_daemon_generated = custom_target('gdbus-daemon-generated', output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'], command : [python, gdbus_codegen, '--interface-prefix', 'org.', - '--generate-c-code', '@OUTDIR@/gdbus-daemon-generated', + '--output-directory', '@OUTDIR@', + '--generate-c-code', 'gdbus-daemon-generated', '--c-namespace', '_G', '@INPUT@']) settings_headers = files([ |