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 <peter.hutterer@who-t.net>

diff --git a/doc/user/meson.build b/doc/user/meson.build
index 8f690e858d0895c9499394d26ed94d696ac3d4d1..a1e77311297e704f1c692d63139f167bc8baf908 100644 (file)
--- 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 90f528e654dc5d7d77e2adcf5f094a8dd7eb5047..97649e57d39bc62e9e45e5891f5b67ccb50d8fdd 100644 (file)
--- 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 == ''