From 7350cbefd8c8694834c6df6610bfe5b76e129c7b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 3 Jun 2022 16:38:05 +0200 Subject: build: stop using deprecated Meson functions Fixes the following warning: NOTICE: Future-deprecated features used: * 0.55.0: {'ExternalProgram.path'} * 0.56.0: {'dependency.get_pkgconfig_variable'} Signed-off-by: Simon Ser --- meson.build | 2 +- tests/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cc27196..c593fef 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('wayland-protocols', version: '1.25', - meson_version: '>= 0.54.0', + meson_version: '>= 0.55.0', license: 'MIT/Expat', ) diff --git a/tests/meson.build b/tests/meson.build index 48d2f80..2441cce 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,6 @@ prog_scan_sh = find_program('scan.sh') dep_scanner = dependency('wayland-scanner', version: '>=1.20.0', native: true) -prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) +prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner')) libwayland = [ dependency('wayland-client'), @@ -14,7 +14,7 @@ foreach protocol_file : protocol_files test(test_name, prog_scan_sh, args: protocol_path, env: [ - 'SCANNER=@0@'.format(prog_scanner.path()), + 'SCANNER=@0@'.format(prog_scanner.full_path()), ] ) endforeach -- cgit v1.2.1