Skip to content

Commit

Permalink
meson: run through muon's fmt to fix formatting
Browse files Browse the repository at this point in the history
Cleans it up.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Oct 3, 2022
1 parent 4db8b50 commit ae2be81
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions meson.build
Expand Up @@ -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')
Expand Down
36 changes: 18 additions & 18 deletions src/catch2/meson.build
Expand Up @@ -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 = [
Expand All @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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(),
)
6 changes: 3 additions & 3 deletions tests/meson.build
Expand Up @@ -56,16 +56,16 @@ 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
# actually put something in the library files.
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)

0 comments on commit ae2be81

Please sign in to comment.