summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2023-01-10 16:17:03 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2023-01-10 16:20:42 -0800
commit3fd47893c53e46d99b575a6c4e1a00d79bec3c6d (patch)
tree38f906179db4c0861bdf3139f7189f1d161a5432
parent1a1e0a82b10d9b928574b0fe2e8af94e55efe918 (diff)
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 <alan.coopersmith@oracle.com>
-rw-r--r--meson.build5
1 files 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'])