summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2022-06-03 16:38:05 +0200
committerSimon Ser <contact@emersion.fr>2022-06-04 09:57:21 +0200
commit7350cbefd8c8694834c6df6610bfe5b76e129c7b (patch)
tree7e9cffca109c31adbe90efe20c8151101e352b08
parenteb115b31375034725e8ad492e276da685b675d8f (diff)
downloadwayland-protocols-7350cbefd8c8694834c6df6610bfe5b76e129c7b.tar.gz
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 <contact@emersion.fr>
-rw-r--r--meson.build2
-rw-r--r--tests/meson.build4
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