meson: ensure dbus-display generated code is built before other units
It's simply by luck that dbus-display header is built first before the other units using it. With sourceset, I can't find an easier way out than declaring an extra dependency for dbus-display1 generate code. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
eb9062d4cf
commit
1222070e77
|
@ -83,7 +83,9 @@ if dbus_display
|
||||||
'--interface-prefix', 'org.qemu.',
|
'--interface-prefix', 'org.qemu.',
|
||||||
'--c-namespace', 'QemuDBus',
|
'--c-namespace', 'QemuDBus',
|
||||||
'--generate-c-code', '@BASENAME@'])
|
'--generate-c-code', '@BASENAME@'])
|
||||||
dbus_ss.add(when: [gio, pixman, opengl, gbm],
|
dbus_display1_lib = static_library('dbus-display1', dbus_display1, dependencies: gio)
|
||||||
|
dbus_display1_dep = declare_dependency(link_with: dbus_display1_lib, include_directories: include_directories('.'))
|
||||||
|
dbus_ss.add(when: [gio, pixman, opengl, gbm, dbus_display1_dep],
|
||||||
if_true: [files(
|
if_true: [files(
|
||||||
'dbus-chardev.c',
|
'dbus-chardev.c',
|
||||||
'dbus-clipboard.c',
|
'dbus-clipboard.c',
|
||||||
|
@ -91,7 +93,7 @@ if dbus_display
|
||||||
'dbus-error.c',
|
'dbus-error.c',
|
||||||
'dbus-listener.c',
|
'dbus-listener.c',
|
||||||
'dbus.c',
|
'dbus.c',
|
||||||
), dbus_display1])
|
)])
|
||||||
ui_modules += {'dbus' : dbus_ss}
|
ui_modules += {'dbus' : dbus_ss}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue