fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-27 03:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson.build: drop the use of join_paths

Browse source 
Replace with the slash notation supported since 0.49

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2022-07-11 15:44:15 +10:00
parent c6c4d33474
commit 0afed6479d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
meson.build
View file

@ -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',