Reformat meson files with meson format
Meson recently got a new format command in 1.5.0 [1]. It makes slightly
different formatting decisions compared to muon (what we used
previously) but given it's the official tool, we should switch to it.
There is one bug resolved recently that requires this format be done
using the meson from master.
Ideally this would be enforced by CI in the future, but that's WIP.
Tested: Whitespace only, code compiles.
[1] https://mesonbuild.com/Commands.html#format
[2] https://github.com/mesonbuild/meson/commit/df706807239095ddbbfd2975b3fe067ad6b5d535
Change-Id: I91506efb659c431e913c717d8a26aa349fccbd75
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/meson.build b/meson.build
index 2eec10b..65e5b54 100644
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,10 @@
# remove debug information for minsize buildtype
if (get_option('buildtype') == 'minsize')
- add_project_arguments(['-fdata-sections', '-ffunction-sections'], language: 'cpp')
+ add_project_arguments(
+ ['-fdata-sections', '-ffunction-sections'],
+ language: 'cpp',
+ )
add_project_arguments('-DNDEBUG', language: 'cpp')
endif
@@ -55,11 +58,13 @@
# Include Directories
-incdir = include_directories('include', 'redfish-core/include', 'redfish-core/lib', 'http')
-incdir_cli = include_directories(
- 'http',
- 'include'
+incdir = include_directories(
+ 'include',
+ 'redfish-core/include',
+ 'redfish-core/lib',
+ 'http',
)
+incdir_cli = include_directories('http', 'include')
if (get_option('tests').allowed())
summary('unittest', 'NA', section: 'Features')
@@ -154,11 +159,13 @@
## Add security flags for builds of type 'release','debugoptimized' and 'minsize'
-if not (
- get_option('buildtype') == 'plain'
- or get_option('buildtype').startswith('debug')
+if not (get_option('buildtype') == 'plain'
+or get_option('buildtype').startswith('debug')
)
- add_project_arguments(cxx.get_supported_arguments([security_flags]), language: 'cpp')
+ add_project_arguments(
+ cxx.get_supported_arguments([security_flags]),
+ language: 'cpp',
+ )
endif
# Boost dependency configuration
@@ -211,10 +218,7 @@
cmake = import('cmake')
opt_var = cmake.subproject_options()
opt_var.add_cmake_defines(
- {
- 'ENABLE_LIB_ONLY': true,
- 'ENABLE_STATIC_LIB': true,
- },
+ {'ENABLE_LIB_ONLY': true, 'ENABLE_STATIC_LIB': true},
)
nghttp2_ex = cmake.subproject('nghttp2', options: opt_var)
nghttp2 = nghttp2_ex.dependency('nghttp2')
@@ -230,11 +234,11 @@
bmcweb_dependencies += sdbusplus
bmcweb_cli_dependencies += sdbusplus
-cli11 = dependency('CLI11', required : false, include_type: 'system')
+cli11 = dependency('CLI11', required: false, include_type: 'system')
if not cli11.found()
- cli11_proj = subproject('cli11', required: true)
- cli11 = cli11_proj.get_variable('CLI11_dep')
- cli11 = cli11.as_system('system')
+ cli11_proj = subproject('cli11', required: true)
+ cli11 = cli11_proj.get_variable('CLI11_dep')
+ cli11 = cli11.as_system('system')
endif
bmcweb_cli_dependencies += cli11
@@ -258,21 +262,23 @@
zlib = dependency('zlib')
bmcweb_dependencies += [systemd, zlib]
-nlohmann_json_dep = dependency('nlohmann_json', version: '>=3.11.2', include_type: 'system')
+nlohmann_json_dep = dependency(
+ 'nlohmann_json',
+ version: '>=3.11.2',
+ include_type: 'system',
+)
bmcweb_dependencies += nlohmann_json_dep
boost = dependency(
'boost',
- modules: [
- 'url',
- ],
+ modules: ['url'],
version: '>=1.84.0',
required: false,
include_type: 'system',
)
if boost.found()
- bmcweb_dependencies += [boost]
- bmcweb_cli_dependencies += [boost]
+ bmcweb_dependencies += [boost]
+ bmcweb_cli_dependencies += [boost]
else
cmake = import('cmake')
opt = cmake.subproject_options()
@@ -325,7 +331,7 @@
systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
-bindir = get_option('prefix') + '/' +get_option('bindir')
+bindir = get_option('prefix') + '/' + get_option('bindir')
libexec = get_option('prefix') + '/' + get_option('libexecdir')
summary(
@@ -377,24 +383,24 @@
# Generate the bmcwebd daemon
executable(
- 'bmcwebd',
- 'src/webserver_main.cpp',
- include_directories : incdir,
- dependencies: bmcweb_dependencies,
- link_with: bmcweblib,
- link_args: '-Wl,--gc-sections',
- install: true,
- install_dir:libexec
+ 'bmcwebd',
+ 'src/webserver_main.cpp',
+ include_directories: incdir,
+ dependencies: bmcweb_dependencies,
+ link_with: bmcweblib,
+ link_args: '-Wl,--gc-sections',
+ install: true,
+ install_dir: libexec,
)
# Generate the bmcweb CLI application
executable(
- 'bmcweb',
- ['src/webserver_cli.cpp','src/boost_asio.cpp'],
- include_directories : incdir_cli,
- dependencies: bmcweb_cli_dependencies,
- install: true,
- install_dir:bindir
+ 'bmcweb',
+ ['src/webserver_cli.cpp', 'src/boost_asio.cpp'],
+ include_directories: incdir_cli,
+ dependencies: bmcweb_cli_dependencies,
+ install: true,
+ install_dir: bindir,
)
srcfiles_unittest = files(
@@ -423,9 +429,9 @@
'test/include/ossl_random.cpp',
'test/include/ssl_key_handler_test.cpp',
'test/include/str_utility_test.cpp',
- 'test/redfish-core/include/privileges_test.cpp',
'test/redfish-core/include/filter_expr_executor_test.cpp',
'test/redfish-core/include/filter_expr_parser_test.cpp',
+ 'test/redfish-core/include/privileges_test.cpp',
'test/redfish-core/include/redfish_aggregator_test.cpp',
'test/redfish-core/include/registries_test.cpp',
'test/redfish-core/include/utils/dbus_utils.cpp',
@@ -457,11 +463,7 @@
link_with: bmcweblib,
include_directories: incdir,
install_dir: bindir,
- dependencies: bmcweb_dependencies
- + [
- gtest,
- gmock,
- ],
+ dependencies: bmcweb_dependencies + [gtest, gmock],
)
test(fs.stem(test_src), test_bin)
endforeach