From ae2be81fb06c022501709d2aacc15aba4a2ea460 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 2 Oct 2022 18:50:32 -0700 Subject: [PATCH] meson: run through muon's fmt to fix formatting Cleans it up. Signed-off-by: Rosen Penev --- meson.build | 4 ++-- src/catch2/meson.build | 36 ++++++++++++++++++------------------ tests/meson.build | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/meson.build b/meson.build index 644f0a2436..5b9b75c11f 100644 --- a/meson.build +++ b/meson.build @@ -8,9 +8,9 @@ project( 'catch2', 'cpp', - version : '3.1.0', # CML version placeholder, don't delete + version: '3.1.0', # CML version placeholder, don't delete license: 'BSL-1.0', - meson_version: '>=0.49.0' + meson_version: '>=0.49.0', ) subdir('src/catch2') diff --git a/src/catch2/meson.build b/src/catch2/meson.build index e39615850a..eb89fc2fdd 100644 --- a/src/catch2/meson.build +++ b/src/catch2/meson.build @@ -15,7 +15,7 @@ configure_file( output: 'catch_user_config.hpp', format: 'cmake@', install_dir: get_option('includedir') / 'catch2', - configuration: conf_data + configuration: conf_data, ) benchmark_headers = [ @@ -38,7 +38,7 @@ benchmark_headers = [ 'benchmark/detail/catch_repeat.hpp', 'benchmark/detail/catch_run_for_at_least.hpp', 'benchmark/detail/catch_stats.hpp', - 'benchmark/detail/catch_timing.hpp' + 'benchmark/detail/catch_timing.hpp', ] benchmark_sources = [ @@ -170,7 +170,7 @@ internal_headers = [ 'internal/catch_wildcard_pattern.hpp', 'internal/catch_windows_h_proxy.hpp', 'internal/catch_xmlwriter.hpp', - 'internal/catch_test_case_info_hasher.hpp' + 'internal/catch_test_case_info_hasher.hpp', ] internal_sources = [ @@ -239,7 +239,7 @@ internal_sources = [ 'matchers/catch_matchers_predicate.cpp', 'matchers/internal/catch_matchers_impl.cpp', 'catch_tag_alias_autoregistrar.cpp', - 'catch_get_random_seed.cpp', + 'catch_get_random_seed.cpp', 'internal/catch_decomposer.cpp', 'internal/catch_errno_guard.cpp', 'internal/catch_lazy_expr.cpp', @@ -273,7 +273,7 @@ reporter_headers = [ 'reporters/catch_reporter_streaming_base.hpp', 'reporters/catch_reporter_tap.hpp', 'reporters/catch_reporter_teamcity.hpp', - 'reporters/catch_reporter_xml.hpp' + 'reporters/catch_reporter_xml.hpp', ] reporter_sources = [ @@ -320,38 +320,38 @@ endforeach catch2 = static_library( 'Catch2', sources, - include_directories : '..', - install : true + include_directories: '..', + install: true, ) catch2_dep = declare_dependency( link_with: catch2, - include_directories: '..' + include_directories: '..', ) pkg.generate( catch2, filebase: 'catch2', - description : 'A modern, C++-native, test framework for C++14 and above', - url: 'https://github.com/catchorg/Catch2' + description: 'A modern, C++-native, test framework for C++14 and above', + url: 'https://github.com/catchorg/Catch2', ) catch2_with_main = static_library( 'Catch2Main', - [ 'internal/catch_main.cpp' ], + 'internal/catch_main.cpp', link_with: catch2, - include_directories : '..', - install : true + include_directories: '..', + install: true, ) catch2_with_main_dep = declare_dependency( - link_with: [ catch2, catch2_with_main ], - include_directories: '..' + link_with: [catch2, catch2_with_main], + include_directories: '..', ) pkg.generate( catch2_with_main, - filebase : 'catch2-with-main', - description : 'A modern, C++-native, test framework for C++14 and above (links in default main)', - requires : 'catch2 = ' + meson.project_version() + filebase: 'catch2-with-main', + description: 'A modern, C++-native, test framework for C++14 and above (links in default main)', + requires: 'catch2 = ' + meson.project_version(), ) diff --git a/tests/meson.build b/tests/meson.build index a7670a9908..0145d78ec1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -56,7 +56,7 @@ self_test_sources = [ 'SelfTest/UsageTests/Tricky.tests.cpp', 'SelfTest/UsageTests/VariadicMacros.tests.cpp', 'SelfTest/UsageTests/MatchersRanges.tests.cpp', - 'SelfTest/UsageTests/Matchers.tests.cpp' + 'SelfTest/UsageTests/Matchers.tests.cpp', ] # This isn't as good as the CMake tests, but it proves that we've @@ -64,8 +64,8 @@ self_test_sources = [ self_test = executable( 'SelfTest', self_test_sources, - include_directories : '../src', - link_with : [ catch2_with_main, catch2 ] + include_directories: '../src', + link_with: [catch2_with_main, catch2], ) test('SelfTest', self_test)