diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-07-11 15:44:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-07-12 09:50:08 +0000 |
| commit | 0afed6479d8321b3991371786cc6f0ad37f79b66 (patch) | |
| tree | 917c7144aebc99912e1a40ea1fc3a8debfce2af4 | |
| parent | c6c4d334742770637cc87230ee8054687f5c4fdb (diff) | |
| download | libevdev-0afed6479d8321b3991371786cc6f0ad37f79b66.tar.gz | |
meson.build: drop the use of join_paths
Replace with the slash notation supported since 0.49
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | meson.build | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 49f7726..d63a41e 100644 --- a/meson.build +++ b/meson.build @@ -7,8 +7,8 @@ project('libevdev', 'c', libevdev_version = meson.project_version().split('.') dir_root = meson.project_source_root() -dir_src = join_paths(dir_root, 'libevdev') -dir_src_test = join_paths(dir_root, 'test') +dir_src = dir_root / 'libevdev' +dir_src_test = dir_root / 'test' # Include directories includes_include = include_directories('include') @@ -40,9 +40,9 @@ pkgconfig = import('pkgconfig') dep_lm = cc.find_library('m') dep_rt = cc.find_library('rt') -input_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'input.h') -uinput_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'uinput.h') -input_event_codes_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'input-event-codes.h') +input_h = dir_root / 'include' / 'linux' / host_machine.system() / 'input.h' +uinput_h = dir_root / 'include' / 'linux' / host_machine.system() / 'uinput.h' +input_event_codes_h = dir_root / 'include' / 'linux' / host_machine.system() / 'input-event-codes.h' # event-names.h make_event_names = find_program('libevdev/make-event-names.py') @@ -73,7 +73,7 @@ src_libevdev = [ uinput_h ] -mapfile = join_paths(dir_src, 'libevdev.sym') +mapfile = dir_src / 'libevdev.sym' version_flag = '-Wl,--version-script,@0@'.format(mapfile) lib_libevdev = library('evdev', src_libevdev, @@ -213,7 +213,7 @@ if dep_check.found() valgrind_env.set('CK_TIMEOUT_MULTIPLIER', '10') valgrind_env.set('CK_FORK', 'no') valgrind_env.set('RUNNING_ON_VALGRIND', '1') - valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') + valgrind_suppressions_file = dir_src_test / 'valgrind.suppressions' add_test_setup('valgrind', exe_wrapper: [ valgrind, '--leak-check=full', @@ -238,8 +238,8 @@ if doxygen.found() src_doxygen = files( # source files - join_paths(dir_src, 'libevdev.h'), - join_paths(dir_src, 'libevdev-uinput.h'), + dir_src / 'libevdev.h', + dir_src / 'libevdev-uinput.h', # style files 'doc/style/bootstrap.css', 'doc/style/customdoxygen.css', @@ -266,7 +266,7 @@ if doxygen.found() doc_config.set('PACKAGE_VERSION', meson.project_version()) doc_config.set('builddir', meson.current_build_dir()) doc_config.set('top_srcdir', dir_root) - doc_config.set('srcdir', join_paths(dir_root, 'doc')) + doc_config.set('srcdir', dir_root / 'doc') doxyfile = configure_file(input: 'doc/libevdev.doxygen.in', output: 'libevdev.doxygen', |