[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/8] meson: add spice dependency to core spice source files.
From: |
Gerd Hoffmann |
Subject: |
[PULL 7/8] meson: add spice dependency to core spice source files. |
Date: |
Thu, 15 Oct 2020 14:53:21 +0200 |
Right now it happens to work by pure luck because the spice chardevs
add the spice dependency to the softmmu source set. That'll change
though once we start building spice chardevs as module, so lets fix
it properly.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201014121120.13482-7-kraxel@redhat.com
---
ui/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/meson.build b/ui/meson.build
index 78ad792ffb8d..6ce814867852 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -14,7 +14,7 @@ softmmu_ss.add(files(
))
softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c'))
-softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c',
'spice-input.c', 'spice-display.c'))
+softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spice-core.c',
'spice-input.c', 'spice-display.c'))
softmmu_ss.add(when: cocoa, if_true: files('cocoa.m'))
vnc_ss = ss.source_set()
--
2.27.0
- [PULL 0/8] Modules 20201015 patches, Gerd Hoffmann, 2020/10/15
- [PULL 2/8] modules: update qom object module comment, Gerd Hoffmann, 2020/10/15
- [PULL 8/8] chardev/spice: build spice chardevs as module, Gerd Hoffmann, 2020/10/15
- [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly, Gerd Hoffmann, 2020/10/15
- [PULL 1/8] module: silence errors for module_load_qom_all()., Gerd Hoffmann, 2020/10/15
- [PULL 5/8] chardev/spice: simplify chardev setup, Gerd Hoffmann, 2020/10/15
- [PULL 6/8] meson: add spice_headers dependency., Gerd Hoffmann, 2020/10/15
- [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static, Gerd Hoffmann, 2020/10/15
- [PULL 7/8] meson: add spice dependency to core spice source files.,
Gerd Hoffmann <=
- Re: [PULL 0/8] Modules 20201015 patches, Peter Maydell, 2020/10/16