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

meson.build: fix some whitespace, put reminder comment in

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-18 19:17:50 +10:00
parent 88701829e7
commit ae0effd5ee
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -20,6 +20,7 @@
AC_PREREQ([2.62]) AC_PREREQ([2.62])
# change meson version too
AC_INIT([libevdev], AC_INIT([libevdev],
[1.8.0], [1.8.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=libevdev], [https://bugs.freedesktop.org/enter_bug.cgi?product=libevdev],

16
meson.build
View file

@ -1,5 +1,5 @@
project('libevdev', 'c', project('libevdev', 'c',
version: '1.8.0', version: '1.8.0', # change autotools version too
license: 'MIT/Expat', license: 'MIT/Expat',
default_options: [ 'c_std=gnu99', 'warning_level=2' ], default_options: [ 'c_std=gnu99', 'warning_level=2' ],
meson_version: '>= 0.47.0') meson_version: '>= 0.47.0')
@ -28,8 +28,8 @@ libevdev_so_version = '@0@.@1@.@2@'.format((libevdev_lt_c - libevdev_lt_a),
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cppflags = ['-Wno-unused-parameter', '-fvisibility=hidden'] cppflags = ['-Wno-unused-parameter', '-fvisibility=hidden']
cflags = cppflags + ['-Wmissing-prototypes', '-Wstrict-prototypes'] cflags = cppflags + ['-Wmissing-prototypes', '-Wstrict-prototypes']
add_project_arguments(cflags, language : 'c') add_project_arguments(cflags, language: 'c')
add_project_arguments(cppflags, language : 'cpp') add_project_arguments(cppflags, language: 'cpp')
# config.h # config.h
config_h = configuration_data() config_h = configuration_data()
@ -185,20 +185,20 @@ if dep_check.found()
test('test-kernel', test_kernel) test('test-kernel', test_kernel)
valgrind = find_program('valgrind', required : false) valgrind = find_program('valgrind', required: false)
if valgrind.found() if valgrind.found()
valgrind_env = environment() valgrind_env = environment()
valgrind_env.set('CK_TIMEOUT_MULTIPLIER', '10') valgrind_env.set('CK_TIMEOUT_MULTIPLIER', '10')
valgrind_env.set('CK_FORK', 'no') valgrind_env.set('CK_FORK', 'no')
valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions')
add_test_setup('valgrind', add_test_setup('valgrind',
exe_wrapper : [ valgrind, exe_wrapper: [ valgrind,
'--leak-check=full', '--leak-check=full',
'--gen-suppressions=all', '--gen-suppressions=all',
'--error-exitcode=3', '--error-exitcode=3',
'--suppressions=' + valgrind_suppressions_file ], '--suppressions=' + valgrind_suppressions_file ],
env : valgrind_env, env: valgrind_env,
timeout_multiplier : 100) timeout_multiplier: 100)
else else
message('valgrind not found, disabling valgrind test suite') message('valgrind not found, disabling valgrind test suite')
endif endif
@ -273,4 +273,4 @@ if get_option('coverity')
endif endif
############ output files ############ ############ output files ############
configure_file(output : 'config.h', configuration : config_h) configure_file(output: 'config.h', configuration: config_h)