diff options
| -rw-r--r-- | doc/html/meson.build | 11 | ||||
| -rw-r--r-- | doc/singlehtml/meson.build | 11 | ||||
| -rw-r--r-- | meson.build | 36 | ||||
| -rw-r--r-- | test/meson.build | 7 | ||||
| -rw-r--r-- | tools/meson.build | 10 |
5 files changed, 48 insertions, 27 deletions
diff --git a/doc/html/meson.build b/doc/html/meson.build index 9ba7097..69b56bb 100644 --- a/doc/html/meson.build +++ b/doc/html/meson.build @@ -9,7 +9,10 @@ custom_target( 'html', build_by_default: true, command: [ - sphinx_build, '-M', 'html', '@OUTDIR@' / '..', '@OUTDIR@' / '..', + sphinx_build, + '-M', 'html', + '@OUTDIR@' / '..', + '@OUTDIR@' / '..', '-t', 'html', ] + sphinx_flags, input: [c_lilv_rst, c_rst_files, conf_py], @@ -28,5 +31,9 @@ custom_target( ) if not meson.is_subproject() - summary('Paginated HTML', get_option('prefix') / html_dir, section: 'Directories') + summary( + 'Paginated HTML', + get_option('prefix') / html_dir, + section: 'Directories', + ) endif diff --git a/doc/singlehtml/meson.build b/doc/singlehtml/meson.build index 2cea8fd..055a9c2 100644 --- a/doc/singlehtml/meson.build +++ b/doc/singlehtml/meson.build @@ -9,7 +9,10 @@ custom_target( 'singlehtml', build_by_default: true, command: [ - sphinx_build, '-M', 'singlehtml', '@OUTDIR@' / '..', '@OUTDIR@' / '..', + sphinx_build, + '-M', 'singlehtml', + '@OUTDIR@' / '..', + '@OUTDIR@' / '..', '-t', 'singlehtml', ] + sphinx_flags, input: [c_lilv_rst, c_rst_files, conf_py], @@ -22,5 +25,9 @@ custom_target( ) if not meson.is_subproject() - summary('Unified HTML', get_option('prefix') / singlehtml_dir, section: 'Directories') + summary( + 'Unified HTML', + get_option('prefix') / singlehtml_dir, + section: 'Directories', + ) endif diff --git a/meson.build b/meson.build index 83150b5..1446615 100644 --- a/meson.build +++ b/meson.build @@ -1,15 +1,18 @@ # Copyright 2021-2022 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -project('lilv', ['c'], - version: '0.24.21', - license: 'ISC', - meson_version: '>= 0.56.0', - default_options: [ - 'b_ndebug=if-release', - 'buildtype=release', - 'c_std=c99', - ]) +project( + 'lilv', + ['c'], + default_options: [ + 'b_ndebug=if-release', + 'buildtype=release', + 'c_std=c99', + ], + license: 'ISC', + meson_version: '>= 0.56.0', + version: '0.24.21', +) lilv_src_root = meson.current_source_dir() major_version = meson.project_version().split('.')[0] @@ -76,9 +79,7 @@ if default_lv2_path == '' endif endif -platform_defines += [ - '-DLILV_DEFAULT_LV2_PATH="@0@"'.format(default_lv2_path) -] +platform_defines += ['-DLILV_DEFAULT_LV2_PATH="@0@"'.format(default_lv2_path)] # Use versioned name everywhere to support parallel major version installations if host_machine.system() == 'windows' @@ -148,7 +149,7 @@ endif liblilv = library( versioned_name, sources, - c_args: c_suppressions + extra_c_args + ['-DLILV_INTERNAL'], + c_args: c_suppressions + extra_c_args + ['-DLILV_INTERNAL'], dependencies: common_dependencies, gnu_symbol_visibility: 'hidden', include_directories: include_directories('include', 'src'), @@ -199,9 +200,9 @@ if not meson.is_subproject() summary( { - 'Install prefix': get_option('prefix'), - 'Headers': get_option('prefix') / get_option('includedir'), - 'Libraries': get_option('prefix') / get_option('libdir'), + 'Install prefix': get_option('prefix'), + 'Headers': get_option('prefix') / get_option('includedir'), + 'Libraries': get_option('prefix') / get_option('libdir'), 'Executables': get_option('prefix') / get_option('bindir'), 'Man pages': get_option('prefix') / get_option('mandir'), }, @@ -244,7 +245,8 @@ if not get_option('tests').disabled() include_directories: include_directories('include', 'src'), c_args: c_suppressions + ['-DLILV_INTERNAL', '-DLILV_STATIC'], dependencies: common_dependencies, - gnu_symbol_visibility: 'default') + gnu_symbol_visibility: 'default', + ) else liblilv_static = liblilv endif diff --git a/test/meson.build b/test/meson.build index 06075b2..d305dad 100644 --- a/test/meson.build +++ b/test/meson.build @@ -18,7 +18,8 @@ if get_option('warning_level') == 'everything' reuse = find_program('reuse', required: false) if reuse.found() test( - 'REUSE', reuse, + 'REUSE', + reuse, args: ['--root', lilv_src_root, 'lint'], suite: 'data', ) @@ -93,7 +94,9 @@ unit_tests = [ ] define_args = [ - '-DLILV_TEST_BUNDLE="@0@/"'.format(meson.current_build_dir() / 'test_plugin.lv2'), + '-DLILV_TEST_BUNDLE="@0@/"'.format( + meson.current_build_dir() / 'test_plugin.lv2', + ), '-DLILV_TEST_DIR="@0@/"'.format(meson.current_build_dir()), ] diff --git a/tools/meson.build b/tools/meson.build index 0e93157..6fa08e3 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -69,10 +69,12 @@ if host_machine.system() != 'windows' int main(void) { struct timespec t; return clock_gettime(CLOCK_MONOTONIC, &t); } ''' - if cc.compiles(clock_gettime_code, - args: platform_defines, - dependencies: [rt_dep], - name: 'clock_gettime') + if cc.compiles( + clock_gettime_code, + args: platform_defines, + dependencies: [rt_dep], + name: 'clock_gettime', + ) lv2bench = executable( 'lv2bench', files('lv2bench.c'), |