diff options
| author | Paolo Bonzini | 2022-04-20 17:33:44 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-04-28 08:52:22 +0200 |
| commit | 7544060ef30590e3e43e145288c990aeb07c5cc5 (patch) | |
| tree | aaca60f5fd800dab2e8473888506e3d5d56c8034 /ui | |
| parent | meson, configure: move usbfs test to meson (diff) | |
| download | qemu-7544060ef30590e3e43e145288c990aeb07c5cc5.tar.gz qemu-7544060ef30590e3e43e145288c990aeb07c5cc5.tar.xz qemu-7544060ef30590e3e43e145288c990aeb07c5cc5.zip | |
meson, configure: move libgio test to meson
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/meson.build b/ui/meson.build index b21d3d1534..eba93b41e3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -74,14 +74,13 @@ if dbus_display dbus_display1 = custom_target('dbus-display gdbus-codegen', output: ['dbus-display1.h', 'dbus-display1.c'], input: files('dbus-display1.xml'), - command: [config_host['GDBUS_CODEGEN'], - '@INPUT@', + command: [gdbus_codegen, '@INPUT@', '--glib-min-required', '2.64', '--output-directory', meson.current_build_dir(), '--interface-prefix', 'org.qemu.', '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@']) - dbus_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], + dbus_ss.add(when: [gio, pixman, opengl], if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', @@ -128,7 +127,7 @@ if spice.found() ui_modules += {'spice-core' : spice_core_ss} endif -if spice.found() and config_host.has_key('CONFIG_GIO') +if spice.found() and gio.found() spice_ss = ss.source_set() spice_ss.add(spice, gio, pixman, files('spice-app.c')) ui_modules += {'spice-app': spice_ss} |