From 3fd47893c53e46d99b575a6c4e1a00d79bec3c6d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 10 Jan 2023 16:17:03 -0800 Subject: meson: replace join_paths with / Sets minimum meson version to 0.50.0 due to use of: * 0.49.0: {'/ with string arguments'} * 0.50.0: {'install arg in configure_file'} Signed-off-by: Alan Coopersmith --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6bd7110..c68e69a 100644 --- a/meson.build +++ b/meson.build @@ -19,7 +19,8 @@ # SOFTWARE. # keep version in sync with configure.ac -project('xorgproto', 'c', license : 'MIT', version : '2022.2') +project('xorgproto', 'c', license : 'MIT', version : '2022.2', + meson_version : '>=0.50.0') cc = meson.get_compiler('c') pcs = [ @@ -114,7 +115,7 @@ ext_xorgproto = declare_dependency( subdir('include') -keysymfile = join_paths(meson.source_root(), 'include', 'X11', 'XF86keysym.h') +keysymfile = meson.source_root() / 'include' / 'X11' / 'XF86keysym.h' test('evdev-keysym-check', find_program('scripts/keysym-generator.py'), args: ['-v', '--header', keysymfile, 'verify']) -- cgit v1.2.3