diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-08-11 15:59:40 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-03-13 22:57:39 +0400 |
| commit | 1222070e772833c6875e0ca63565db12c22df39e (patch) | |
| tree | 9f552ed46d8e22de4343b74a0b049f7b4aa1107a | |
| parent | eb9062d4cf2959b7fac696d024694b2d62cedf31 (diff) | |
| download | focaccia-qemu-1222070e772833c6875e0ca63565db12c22df39e.tar.gz focaccia-qemu-1222070e772833c6875e0ca63565db12c22df39e.zip | |
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>
| -rw-r--r-- | ui/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/meson.build b/ui/meson.build index 612ea2325b..0b2d0d21d1 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -83,7 +83,9 @@ if dbus_display '--interface-prefix', 'org.qemu.', '--c-namespace', 'QemuDBus', '--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( 'dbus-chardev.c', 'dbus-clipboard.c', @@ -91,7 +93,7 @@ if dbus_display 'dbus-error.c', 'dbus-listener.c', 'dbus.c', - ), dbus_display1]) + )]) ui_modules += {'dbus' : dbus_ss} endif |