[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/11] meson: ensure dbus-display generated code is built before
From: |
marcandre . lureau |
Subject: |
[PATCH 05/11] meson: ensure dbus-display generated code is built before other units |
Date: |
Mon, 30 Jan 2023 15:24:25 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
ui/meson.build | 6 ++++--
1 file 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
--
2.39.1
- [PATCH 00/11] ui: dbus & misc fixes, marcandre . lureau, 2023/01/30
- [PATCH 01/11] ui/dbus: unregister clipboard on connection close, marcandre . lureau, 2023/01/30
- [PATCH 02/11] audio/dbus: there are no sender for p2p mode, marcandre . lureau, 2023/01/30
- [PATCH 03/11] ui/dbus: set mouse is-absolute during console creation, marcandre . lureau, 2023/01/30
- [PATCH 04/11] ui/dbus: update the display when switching surface, marcandre . lureau, 2023/01/30
- [PATCH 05/11] meson: ensure dbus-display generated code is built before other units,
marcandre . lureau <=
- [PATCH 06/11] ui: rename cursor_{put->unref}, marcandre . lureau, 2023/01/30
- [PATCH 08/11] ui: keep current cursor with QemuConsole, marcandre . lureau, 2023/01/30
- [PATCH 10/11] ui: set cursor position upon listener registration, marcandre . lureau, 2023/01/30
- [PATCH 09/11] ui: set cursor upon listener registration, marcandre . lureau, 2023/01/30
- [PATCH 07/11] ui: rename cursor_{get->ref}, return it, marcandre . lureau, 2023/01/30
- [PATCH 11/11] ui/sdl: get the GL context from the window, marcandre . lureau, 2023/01/30