fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-05 13:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: replace a meson.source_root() with the explicit directory

Browse source 
Removes the warning that source_root() has been deprecated since 0.56.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2022-03-28 10:21:58 +10:00
parent f917661980
commit 423bb6455f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/user/meson.build
View file

@ -194,7 +194,7 @@ if yq.found()
foreach distro : distributions foreach distro : distributions
yq_filter = '.distributions[] | select(.name == "@0@") | .packages | join(" ")'.format(distro) yq_filter = '.distributions[] | select(.name == "@0@") | .packages | join(" ")'.format(distro)
deps = run_command(yq, '-r', yq_filter, deps = run_command(yq, '-r', yq_filter,
meson.source_root() / '.gitlab-ci' / 'config.yml', dir_gitlab_ci / 'config.yml',
check: true).stdout() check: true).stdout()
dependencies_config.set('@0@_PACKAGES'.format(distro.to_upper()), deps) dependencies_config.set('@0@_PACKAGES'.format(distro.to_upper()), deps)
endforeach endforeach

1
meson.build
View file

@ -16,6 +16,7 @@ dir_system_udev = get_option('prefix') / 'lib' / 'udev'
dir_src_quirks = meson.current_source_dir() / 'quirks' dir_src_quirks = meson.current_source_dir() / 'quirks'
dir_src_test = meson.current_source_dir() / 'test' dir_src_test = meson.current_source_dir() / 'test'
dir_src = meson.current_source_dir() / 'src' dir_src = meson.current_source_dir() / 'src'
dir_gitlab_ci = meson.current_source_dir() / '.gitlab-ci'
dir_udev = get_option('udev-dir') dir_udev = get_option('udev-dir')
if dir_udev == '' if dir_udev == ''