| Message ID | 20220927095921.261760-4-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Small meson updates for QEMU 7.2 | expand |
On Tue, Sep 27, 2022 at 1:59 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > This is new in Meson 0.60.0. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > meson.build | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/meson.build b/meson.build > index 8be01ba1c3..e1700d1d55 100644 > --- a/meson.build > +++ b/meson.build > @@ -825,14 +825,10 @@ if have_system and get_option('curses').allowed() > }''' > > curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw'] > - foreach curses_dep : curses_dep_list > - if not curses.found() > - curses = dependency(curses_dep, > - required: false, > - method: 'pkg-config', > - kwargs: static_kwargs) > - endif > - endforeach > + curses = dependency(curses_dep_list, > + required: false, > + method: 'pkg-config', > + kwargs: static_kwargs) > msg = get_option('curses').enabled() ? 'curses library not found' : '' > curses_compile_args = ['-DNCURSES_WIDECHAR=1'] > if curses.found() > -- > 2.37.3 >
diff --git a/meson.build b/meson.build index 8be01ba1c3..e1700d1d55 100644 --- a/meson.build +++ b/meson.build @@ -825,14 +825,10 @@ if have_system and get_option('curses').allowed() }''' curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw'] - foreach curses_dep : curses_dep_list - if not curses.found() - curses = dependency(curses_dep, - required: false, - method: 'pkg-config', - kwargs: static_kwargs) - endif - endforeach + curses = dependency(curses_dep_list, + required: false, + method: 'pkg-config', + kwargs: static_kwargs) msg = get_option('curses').enabled() ? 'curses library not found' : '' curses_compile_args = ['-DNCURSES_WIDECHAR=1'] if curses.found()
This is new in Meson 0.60.0. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)