From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 7/8] meson: add spice dependency to core spice source files.
Date: Thu, 15 Oct 2020 14:53:21 +0200 [thread overview]
Message-ID: <20201015125322.23648-8-kraxel@redhat.com> (raw)
In-Reply-To: <20201015125322.23648-1-kraxel@redhat.com>
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
next prev parent reply other threads:[~2020-10-15 12:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 12:53 [PULL 0/8] Modules 20201015 patches Gerd Hoffmann
2020-10-15 12:53 ` [PULL 1/8] module: silence errors for module_load_qom_all() Gerd Hoffmann
2020-10-15 12:53 ` [PULL 2/8] modules: update qom object module comment Gerd Hoffmann
2020-10-15 12:53 ` [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly Gerd Hoffmann
2020-10-15 12:53 ` [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static Gerd Hoffmann
2020-10-15 12:53 ` [PULL 5/8] chardev/spice: simplify chardev setup Gerd Hoffmann
2020-10-15 12:53 ` [PULL 6/8] meson: add spice_headers dependency Gerd Hoffmann
2020-10-15 12:53 ` Gerd Hoffmann [this message]
2020-10-15 12:53 ` [PULL 8/8] chardev/spice: build spice chardevs as module Gerd Hoffmann
2020-10-16 16:38 ` [PULL 0/8] Modules 20201015 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015125322.23648-8-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).