meson: Fixup formatting
Change-Id: Ia948e7605bead1ddfb17b8071cd39cc28353eadc
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meson.build b/meson.build
index 456f179..6b5b6a4 100644
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,13 @@
-project('phosphor-watchdog', 'cpp',
- version: '0.1', meson_version: '>=0.49.0',
- default_options: [
- 'warning_level=3',
- 'werror=true',
- 'cpp_std=c++17'
- ])
-
-build_tests = get_option('tests')
+project(
+ 'phosphor-watchdog',
+ 'cpp',
+ version: '0.1',
+ meson_version: '>=0.49.0',
+ default_options: [
+ 'warning_level=3',
+ 'werror=true',
+ 'cpp_std=c++17',
+ ])
phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces')
phosphor_logging = dependency('phosphor-logging')
@@ -38,6 +39,6 @@
install: true,
install_dir: get_option('bindir'))
-if not build_tests.disabled()
+if not get_option('tests').disabled()
subdir('test')
endif
diff --git a/test/meson.build b/test/meson.build
index 4218665..b57140c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,13 +1,17 @@
-gtest = dependency('gtest', main: true, disabler: true, required: build_tests)
-gmock = dependency('gmock', disabler: true, required: build_tests)
+gtest = dependency('gtest', main: true, disabler: true, required: get_option('tests'))
+gmock = dependency('gmock', disabler: true, required: get_option('tests'))
tests = [
'watchdog',
]
foreach t : tests
- test(t, executable(t.underscorify(), t + '.cpp',
- implicit_include_directories: false,
- link_with: libwatchdog,
- dependencies: [gtest, gmock]))
+ test(
+ t,
+ executable(
+ t.underscorify(),
+ t + '.cpp',
+ implicit_include_directories: false,
+ link_with: libwatchdog,
+ dependencies: [gtest, gmock]))
endforeach