Skip to content

Commit

Permalink
meson: multiple names can be passed to dependency()
Browse files Browse the repository at this point in the history
This is new in Meson 0.60.0.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Oct 1, 2022
1 parent 8a29c20 commit 6d32263
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions meson.build
Expand Up @@ -830,14 +830,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()
Expand Down

0 comments on commit 6d32263

Please sign in to comment.