meson: Only install icons and qemu.desktop if have_system
PATCH 1/1 meson: Only install icons and qemu.desktop if have_system
These files are not needed for a linux-user only install.
Signed-off-by Bruce Rogers <[email protected]>
--- ui/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
ui/meson.build +5 -2
@@ -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}
Signature · 1 line
2.28.0
Paolo Bonzini
AppliedQuoted 16 lines · Bruce Rogers
These files are not needed for a linux-user only install.
Signed-off-by Bruce Rogers <[email protected]>--- ui/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)ui/meson.build +0
-0@@ -113,8 +113,11 @@ if have_system or xkbcommon.found() endif subdir('shader')
ui/meson.build if have_system or xkbcommon.found() · line 123
Quoted 10 lines
ui/meson.build +5
-2-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}
Queued, thanks.
Paolo
Quoted 13 lines · Bruce Rogers
These files are not needed for a linux-user only install.
Signed-off-by Bruce Rogers <[email protected]>--- ui/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)ui/meson.build +0
-0
ui/meson.build if have_system or xkbcommon.found() · line 118
Quoted 8 lines
ui/meson.build +1
-2@@ -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
Some tools could have an icon, QSD later?
For now:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
+ subdir('icons')
Quoted 11 lines
ui/meson.build +3
-1+ + install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) +endif modules += {'ui': ui_modules} --2.28.0
Quoted 17 lines · Philippe Mathieu-Daudé
Quoted 15 lines · Bruce Rogers
These files are not needed for a linux-user only install.
Signed-off-by Bruce Rogers <[email protected]>--- ui/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)ui/meson.build +0
-0@@ -113,8 +113,11 @@ if have_system or xkbcommon.found() endif
Quoted 8 lines
ui/meson.build if have_system or xkbcommon.found() · line 122
Quoted 6 lines
ui/meson.build +1
-2subdir('shader') -subdir('icons') -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) +if have_systemSome tools could have an icon, QSD later?
The icons are only needed for the tools with graphical display (ie SDL) right now.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|