From 485393a6c1a9169f6a2f4a3b8d3f4146f1dbcca4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Sep 2023 17:13:02 -0400 Subject: Format meson.build files with muon The less time wasted with manual code formatting, the better. --- meson.build | 50 ++++++++++++++++++++++++------------------ meson/suppressions/meson.build | 26 +++++++++++++--------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/meson.build b/meson.build index 0335fec..c6f2e28 100644 --- a/meson.build +++ b/meson.build @@ -1,16 +1,19 @@ # Copyright 2021-2023 David Robillard # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later -project('ganv', ['c', 'cpp'], - version: '1.8.3', - license: 'GPLv3+', - meson_version: '>= 0.56.0', - default_options: [ - 'b_ndebug=if-release', - 'buildtype=release', - 'c_std=c99', - 'cpp_std=c++11', - ]) +project( + 'ganv', + ['c', 'cpp'], + default_options: [ + 'b_ndebug=if-release', + 'buildtype=release', + 'c_std=c99', + 'cpp_std=c++11', + ], + license: 'GPLv3+', + meson_version: '>= 0.56.0', + version: '1.8.3', +) ganv_src_root = meson.current_source_dir() major_version = meson.project_version().split('.')[0] @@ -42,17 +45,19 @@ m_dep = cc.find_library('m', required: false) intl_dep = cc.find_library('intl', required: get_option('nls')) -gtk2_dep = dependency('gtk+-2.0', - version: '>= 2.10.0', - include_type: 'system') +gtk2_dep = dependency('gtk+-2.0', version: '>= 2.10.0', include_type: 'system') -gtkmm2_dep = dependency('gtkmm-2.4', - version: '>= 2.10.0', - include_type: 'system') +gtkmm2_dep = dependency( + 'gtkmm-2.4', + include_type: 'system', + version: '>= 2.10.0', +) -gvc_dep = dependency('libgvc', - include_type: 'system', - required: get_option('graphviz')) +gvc_dep = dependency( + 'libgvc', + include_type: 'system', + required: get_option('graphviz'), +) ########################## # Platform Configuration # @@ -94,8 +99,11 @@ if not get_option('nls').disabled() dgettext_code = '''#include int main(void) { !!dgettext("ganv", "string"); }''' - config_defines += ['-DHAVE_DGETTEXT=@0@'.format( - cc.compiles(dgettext_code, name: 'dgettext').to_int())] + config_defines += [ + '-DHAVE_DGETTEXT=@0@'.format( + cc.compiles(dgettext_code, name: 'dgettext').to_int(), + ), + ] endif add_project_arguments(config_defines, language: ['c', 'cpp']) diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index 3651bc0..6e8868e 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -69,10 +69,12 @@ if is_variable('cc') endif if warning_level in ['everything', '3'] - c_suppressions += clang_common_suppressions + [ - '-Wno-cast-function-type', - '-Wno-pedantic', - ] + c_suppressions += ( + clang_common_suppressions + [ + '-Wno-cast-function-type', + '-Wno-pedantic', + ] + ) endif elif cc.get_id() == 'gcc' @@ -85,15 +87,19 @@ if is_variable('cc') endif if warning_level in ['everything', '3'] - c_suppressions += gcc_common_suppressions + [ - '-Wno-pedantic', - ] + c_suppressions += ( + gcc_common_suppressions + [ + '-Wno-pedantic', + ] + ) endif if warning_level in ['everything', '3', '2'] - c_suppressions += gcc_common_suppressions + [ - '-Wno-cast-function-type', - ] + c_suppressions += ( + gcc_common_suppressions + [ + '-Wno-cast-function-type', + ] + ) endif elif cc.get_id() == 'msvc' -- cgit v1.2.1