[PATCH v5 6/7] meson: add spice dependency to core spice source files.

Gerd Hoffmann posted 7 patches 5 years, 3 months ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
[PATCH v5 6/7] meson: add spice dependency to core spice source files.
Posted by Gerd Hoffmann 5 years, 3 months ago
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>
---
 ui/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/meson.build b/ui/meson.build
index 8a080c38e325..bad7a3745148 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


Re: [PATCH v5 6/7] meson: add spice dependency to core spice source files.
Posted by Philippe Mathieu-Daudé 5 years, 3 months ago
On 10/14/20 2:11 PM, Gerd Hoffmann wrote:
> 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>
> ---
>   ui/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>