| Message ID | 20201015201840.282956-1-brogers@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | meson: Only install icons and qemu.desktop if have_system | expand |
On 15/10/20 22:18, Bruce Rogers wrote: > These files are not needed for a linux-user only install. > > Signed-off-by: Bruce Rogers <brogers@suse.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} > Queued, thanks. Paolo
Le jeu. 15 oct. 2020 22:22, Bruce Rogers <brogers@suse.com> a écrit : > These files are not needed for a linux-user only install. > Signed-off-by: Bruce Rogers <brogers@suse.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 > Some tools could have an icon, QSD later? For now: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> + subdir('icons') > + > + install_data('qemu.desktop', install_dir: > config_host['qemu_desktopdir']) > +endif > > modules += {'ui': ui_modules} > -- > 2.28.0 > > > <div dir="auto"><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le jeu. 15 oct. 2020 22:22, Bruce Rogers <<a href="mailto:brogers@suse.com">brogers@suse.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">These files are not needed for a linux-user only install.</blockquote></div></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Signed-off-by: Bruce Rogers <<a href="mailto:brogers@suse.com" target="_blank" rel="noreferrer">brogers@suse.com</a>><br> ---<br> ui/meson.build | 7 +++++--<br> 1 file changed, 5 insertions(+), 2 deletions(-)<br> <br> diff --git a/ui/meson.build b/ui/meson.build<br> index 78ad792ffb..fb36d305ca 100644<br> --- a/ui/meson.build<br> +++ b/ui/meson.build<br> @@ -113,8 +113,11 @@ if have_system or xkbcommon.found()<br> endif<br> <br> subdir('shader')<br> -subdir('icons')<br> <br> -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])<br> +if have_system<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Some tools could have an icon, QSD later?</div><div dir="auto"><br></div><div dir="auto">For now: </div><div dir="auto">Reviewed-by: Philippe Mathieu-Daudé <<a href="mailto:f4bug@amsat.org">f4bug@amsat.org</a>><br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + subdir('icons')<br> +<br> + install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir'])<br> +endif<br> <br> modules += {'ui': ui_modules}<br> -- <br> 2.28.0<br> <br> <br> </blockquote></div></div></div>
On Fri, Oct 16, 2020 at 10:26:16AM +0200, Philippe Mathieu-Daudé wrote: > Le jeu. 15 oct. 2020 22:22, Bruce Rogers <brogers@suse.com> a écrit : > > > These files are not needed for a linux-user only install. > > > > Signed-off-by: Bruce Rogers <brogers@suse.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 > > > > Some tools could have an icon, QSD later? The icons are only needed for the tools with graphical display (ie SDL) right now. Regards, Daniel
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}
These files are not needed for a linux-user only install. Signed-off-by: Bruce Rogers <brogers@suse.com> --- ui/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)