[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/22] meson: Only install icons and qemu.desktop if have_system
From: |
Paolo Bonzini |
Subject: |
[PULL 15/22] meson: Only install icons and qemu.desktop if have_system |
Date: |
Fri, 16 Oct 2020 07:48:07 -0400 |
From: Bruce Rogers <brogers@suse.com>
These files are not needed for a linux-user only install.
Signed-off-by: Bruce Rogers <brogers@suse.com>
Message-Id: <20201015201840.282956-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
ui/meson.build | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ui/meson.build b/ui/meson.build
index 78ad792ffb..fb36d305ca 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -113,8 +113,11 @@ if have_system or xkbcommon.found()
endif
subdir('shader')
-subdir('icons')
-install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
+if have_system
+ subdir('icons')
+
+ install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])
+endif
modules += {'ui': ui_modules}
--
2.26.2
- [PULL 06/22] configure: move QEMU_INCLUDES to meson, (continued)
- [PULL 06/22] configure: move QEMU_INCLUDES to meson, Paolo Bonzini, 2020/10/16
- [PULL 05/22] tests: add missing generated sources to testqapi, Paolo Bonzini, 2020/10/16
- [PULL 08/22] add ninja to dockerfiles, CI configurations and test VMs, Paolo Bonzini, 2020/10/16
- [PULL 11/22] build: add --enable/--disable-libudev, Paolo Bonzini, 2020/10/16
- [PULL 04/22] make: run shell with pipefail, Paolo Bonzini, 2020/10/16
- [PULL 14/22] configure: fix handling of --docdir parameter, Paolo Bonzini, 2020/10/16
- [PULL 07/22] dockerfiles: enable Centos 8 PowerTools, Paolo Bonzini, 2020/10/16
- [PULL 13/22] meson: cleanup curses/iconv test, Paolo Bonzini, 2020/10/16
- [PULL 12/22] meson.build: don't condition iconv detection on library detection, Paolo Bonzini, 2020/10/16
- [PULL 09/22] build: cleanups to Makefile, Paolo Bonzini, 2020/10/16
- [PULL 15/22] meson: Only install icons and qemu.desktop if have_system,
Paolo Bonzini <=
- [PULL 16/22] docs: Fix Sphinx configuration for msys2/mingw, Paolo Bonzini, 2020/10/16
- [PULL 18/22] meson: Move the detection logic for sphinx to meson, Paolo Bonzini, 2020/10/16
- [PULL 10/22] build: replace ninjatool with ninja, Paolo Bonzini, 2020/10/16
- [PULL 20/22] fuzz: Disable QEMU's SIG{INT,HUP,TERM} handlers, Paolo Bonzini, 2020/10/16
- [PULL 21/22] hax: unbreak accelerator cpu code after cpus.c split, Paolo Bonzini, 2020/10/16
- [PULL 19/22] cirrus: Enable doc build on msys2/mingw, Paolo Bonzini, 2020/10/16
- [PULL 17/22] meson: move SPHINX_ARGS references within "if build_docs", Paolo Bonzini, 2020/10/16
- [PULL 22/22] ci: include configure and meson logs in all jobs if configure fails, Paolo Bonzini, 2020/10/16