From 423bb6455f0b7c47948000aeea42e4e4417700db Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 28 Mar 2022 10:21:58 +1000 Subject: [PATCH] meson: replace a meson.source_root() with the explicit directory Removes the warning that source_root() has been deprecated since 0.56.0 Signed-off-by: Peter Hutterer --- doc/user/meson.build | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/meson.build b/doc/user/meson.build index 8f690e85..a1e77311 100644 --- a/doc/user/meson.build +++ b/doc/user/meson.build @@ -194,7 +194,7 @@ if yq.found() foreach distro : distributions yq_filter = '.distributions[] | select(.name == "@0@") | .packages | join(" ")'.format(distro) deps = run_command(yq, '-r', yq_filter, - meson.source_root() / '.gitlab-ci' / 'config.yml', + dir_gitlab_ci / 'config.yml', check: true).stdout() dependencies_config.set('@0@_PACKAGES'.format(distro.to_upper()), deps) endforeach diff --git a/meson.build b/meson.build index 90f528e6..97649e57 100644 --- a/meson.build +++ b/meson.build @@ -16,6 +16,7 @@ dir_system_udev = get_option('prefix') / 'lib' / 'udev' dir_src_quirks = meson.current_source_dir() / 'quirks' dir_src_test = meson.current_source_dir() / 'test' dir_src = meson.current_source_dir() / 'src' +dir_gitlab_ci = meson.current_source_dir() / '.gitlab-ci' dir_udev = get_option('udev-dir') if dir_udev == ''