meson: switch to "foo in array" style for meson arrays

In Meson, string.contains() is a substring check but array.contains() is
a full string check. Let's use 'foo in bar' style instead to avoid
confusion.

Supported since meson 0.49.0
This commit is contained in:
Peter Hutterer 2021-10-26 12:46:05 +10:00 committed by Wim Taymans
parent 07c5511aed
commit 9acee530e2
2 changed files with 3 additions and 3 deletions

View file

@ -422,7 +422,7 @@ if not libintl_dep.found()
endif endif
summary({'intl support': libintl_dep.found()}, bool_yn: true) summary({'intl support': libintl_dep.found()}, bool_yn: true)
need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session') need_alsa = get_option('pipewire-alsa').enabled() or 'media-session' in get_option('session-managers')
alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa)
summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true) summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true)

View file

@ -23,8 +23,8 @@ conf_config_uninstalled.set('pipewire_pulse_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse') meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('pulse_comment', '') conf_config_uninstalled.set('pulse_comment', '')
build_ms = get_option('session-managers').contains('media-session') build_ms = 'media-session' in get_option('session-managers')
build_wp = get_option('session-managers').contains('wireplumber') build_wp = 'wireplumber' in get_option('session-managers')
default_sm = get_option('session-managers').get(0, '') default_sm = get_option('session-managers').get(0, '')
summary({'Build media-session': build_ms, summary({'Build media-session': build_ms,