luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix wrong #include's for gdbus_codegen files

Browse Source 
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.
This commit is contained in:
Alessandro Decina 2017-07-12 16:15:38 +10:00 committed by Matthias Clasen
parent dbf0a56670
commit 266bc1e510
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/meson.build
View File

@ -175,7 +175,8 @@ xdp_dbus_generated = custom_target('xdp-dbus',
output : ['xdp-dbus.h', 'xdp-dbus.c'], output : ['xdp-dbus.h', 'xdp-dbus.c'],
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.freedesktop.portal.', '--interface-prefix', 'org.freedesktop.portal.',
'--generate-c-code', '@OUTDIR@/xdp-dbus', '--output-directory', '@OUTDIR@',
'--generate-c-code', 'xdp-dbus',
'--c-namespace', 'GXdp', '--c-namespace', 'GXdp',
'--annotate', 'org.freedesktop.portal.Documents.Add()', '--annotate', 'org.freedesktop.portal.Documents.Add()',
'org.gtk.GDBus.C.UnixFD', 'true', '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'], output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.', '--interface-prefix', 'org.',
'--generate-c-code', '@OUTDIR@/gdbus-daemon-generated', '--output-directory', '@OUTDIR@',
'--generate-c-code', 'gdbus-daemon-generated',
'--c-namespace', '_G', '@INPUT@']) '--c-namespace', '_G', '@INPUT@'])
settings_headers = files([ settings_headers = files([