Replace strict option with new meson warning level

4 files changed, 30 insertions, 216 deletions

diff --git a/meson.build b/meson.build
index 09712c3..52b9012 100644
--- a/meson.build
+++ b/meson.build
@@ -25,24 +25,36 @@ versioned_name = 'chilbert-@0@'.format(major_version)
 pkg = import('pkgconfig')
 cpp = meson.get_compiler('cpp')
 
-# Set global warning flags
-if get_option('strict')
-  if not meson.is_subproject()
-    subdir('meson/warnings')
-    add_project_arguments(all_cpp_warnings, language: ['cpp'])
-  endif
-
-  cpp_suppressions = []
-  if cpp.get_id() == 'clang'
+# Set global warning suppressions
+cpp_suppressions = []
+warning_level = get_option('warning_level')
+if cpp.get_id() in ['clang', 'emscripten']
+  if warning_level == 'everything'
     cpp_suppressions += [
+      '-Wno-c++98-compat',
+      '-Wno-c++98-compat-pedantic',
       '-Wno-padded',
     ]
-  elif cpp.get_id() == 'gcc'
+
+    if not meson.is_cross_build()
+      cpp_suppressions += [
+        '-Wno-poison-system-directories',
+      ]
+    endif
+  endif
+
+elif cpp.get_id() == 'gcc'
+  if warning_level == 'everything'
     cpp_suppressions += [
       '-Wno-effc++',
+      '-Wno-inline',
+      '-Wno-suggest-attribute=pure',
       '-Wno-volatile',
     ]
-  elif cpp.get_id() == 'msvc'
+  endif
+
+elif cpp.get_id() == 'msvc'
+  if warning_level == 'everything'
     cpp_suppressions += [
       '/wd4028', # formal parameter different from declaration
       '/wd4204', # non-constant aggregate initializer
@@ -55,13 +67,10 @@ if get_option('strict')
       '/wd5045', # will insert Spectre mitigation
     ]
   endif
-
-  add_project_arguments(
-    cpp.get_supported_arguments(cpp_suppressions),
-    language: ['cpp'],
-  )
 endif
 
+cpp_suppressions = cpp.get_supported_arguments(cpp_suppressions)
+
 ###########
 # Library #
 ###########
@@ -123,6 +132,7 @@ if not get_option('tests').disabled()
       executable(
         full_name,
         'test/@0@.cpp'.format(full_name),
+        cpp_args: cpp_suppressions,
         include_directories: include_directories('include'),
       ),
       timeout: 1200,
@@ -137,6 +147,7 @@ if not get_option('tests').disabled()
       executable(
         'test_hilbert',
         'test/test_hilbert.cpp',
+        cpp_args: cpp_suppressions,
         dependencies: [gmp_dep, gmpxx_dep],
         include_directories: include_directories('include'),
       ),
@@ -150,6 +161,7 @@ if not get_option('benchmarks').disabled()
     executable(
       'bench_@0@'.format(name),
       files('benchmark/bench_@0@.cpp'.format(name)),
+      cpp_args: cpp_suppressions,
       include_directories: include_directories('include', 'test'),
     )
   endforeach
diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build
deleted file mode 100644
index 6aecf0a..0000000
--- a/meson/warnings/meson.build
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: 0BSD OR GPL-2.0-or-later
-
-# General code to enable approximately all warnings in GCC 12, clang, and MSVC.
-#
-# This is trivial for clang and MSVC, but GCC doesn't have an "everything"
-# option, so we need to enable everything we want explicitly.  Wall is assumed,
-# but Wextra is not, for stability.
-#
-# These are collected from common.opt and c.opt in the GCC source, and manually
-# curated with the help of the GCC documentation.  Warnings that are
-# application-specific, historical, or about compatibility between specific
-# language revisions are omitted.  The intent here is to have roughly the same
-# meaning as clang's Weverything: extremely strict, but general.  Specifically
-# omitted are:
-#
-# General:
-#
-# Wabi=
-# Waggregate-return
-# Walloc-size-larger-than=BYTES
-# Walloca-larger-than=BYTES
-# Wframe-larger-than=BYTES
-# Wlarger-than=BYTES
-# Wstack-usage=BYTES
-# Wsystem-headers
-# Wtraditional
-# Wtraditional-conversion
-# Wtrampolines
-# Wvla-larger-than=BYTES
-#
-# Build specific:
-#
-# Wpoison-system-directories
-#
-# C Specific:
-#
-# Wc11-c2x-compat
-# Wc90-c99-compat
-# Wc99-c11-compat
-# Wdeclaration-after-statement
-# Wtraditional
-# Wtraditional-conversion
-#
-# C++ Specific:
-#
-# Wc++0x-compat
-# Wc++1z-compat
-# Wc++2a-compat
-# Wctad-maybe-unsupported
-# Wnamespaces
-# Wtemplates
-
-gcc_common_warnings = [
-  '-Walloc-zero',
-  '-Walloca',
-  '-Wanalyzer-too-complex',
-  '-Warith-conversion',
-  '-Warray-bounds=2',
-  '-Wattribute-alias=2',
-  '-Wbidi-chars=ucn',
-  '-Wcast-align=strict',
-  '-Wcast-function-type',
-  '-Wcast-qual',
-  '-Wclobbered',
-  '-Wconversion',
-  '-Wdate-time',
-  '-Wdisabled-optimization',
-  '-Wdouble-promotion',
-  '-Wduplicated-branches',
-  '-Wduplicated-cond',
-  '-Wempty-body',
-  '-Wendif-labels',
-  '-Wfloat-equal',
-  '-Wformat-overflow=2',
-  '-Wformat-signedness',
-  '-Wformat-truncation=2',
-  '-Wformat=2',
-  '-Wignored-qualifiers',
-  '-Wimplicit-fallthrough=3',
-  '-Winit-self',
-  '-Winline',
-  '-Winvalid-pch',
-  '-Wlogical-op',
-  '-Wmissing-declarations',
-  '-Wmissing-field-initializers',
-  '-Wmissing-include-dirs',
-  '-Wmultichar',
-  '-Wnormalized=nfc',
-  '-Wnull-dereference',
-  '-Wopenacc-parallelism',
-  '-Woverlength-strings',
-  '-Wpacked',
-  '-Wpacked-bitfield-compat',
-  '-Wpadded',
-  '-Wpointer-arith',
-  '-Wredundant-decls',
-  '-Wshadow',
-  '-Wshift-negative-value',
-  '-Wshift-overflow=2',
-  '-Wstack-protector',
-  '-Wstrict-aliasing=3',
-  '-Wstrict-overflow=5',
-  '-Wstring-compare',
-  '-Wstringop-overflow=3',
-  '-Wsuggest-attribute=cold',
-  '-Wsuggest-attribute=const',
-  '-Wsuggest-attribute=format',
-  '-Wsuggest-attribute=malloc',
-  '-Wsuggest-attribute=noreturn',
-  '-Wsuggest-attribute=pure',
-  '-Wswitch-default',
-  '-Wswitch-enum',
-  '-Wtrampolines',
-  '-Wtrivial-auto-var-init',
-  '-Wtype-limits',
-  '-Wundef',
-  '-Wuninitialized',
-  '-Wunsafe-loop-optimizations',
-  '-Wunused',
-  '-Wunused-const-variable=2',
-  '-Wunused-macros',
-  '-Wvector-operation-performance',
-  '-Wvla',
-  '-Wwrite-strings',
-]
-
-#######
-# C++ #
-#######
-
-if is_variable('cpp')
-  all_cpp_warnings = []
-
-  if cpp.get_id() == 'clang'
-    all_cpp_warnings += [
-      '-Weverything',
-      '-Wno-c++98-compat',
-      '-Wno-c++98-compat-pedantic'
-    ]
-
-    if not meson.is_cross_build()
-      all_cpp_warnings += [
-        '-Wno-poison-system-directories',
-      ]
-    endif
-
-  elif cpp.get_id() == 'gcc'
-    all_cpp_warnings += gcc_common_warnings + [
-      '-Wabi-tag',
-      '-Waligned-new=all',
-      '-Wcatch-value=3',
-      '-Wcomma-subscript',
-      '-Wconditionally-supported',
-      '-Wctor-dtor-privacy',
-      '-Wdelete-non-virtual-dtor',
-      '-Wdeprecated',
-      '-Wdeprecated-copy',
-      '-Wdeprecated-copy-dtor',
-      '-Wdeprecated-enum-enum-conversion',
-      '-Wdeprecated-enum-float-conversion',
-      '-Weffc++',
-      '-Wexpansion-to-defined',
-      '-Wextra-semi',
-      '-Wimport',
-      '-Winvalid-imported-macros',
-      '-Wmismatched-tags',
-      '-Wmultiple-inheritance',
-      '-Wnoexcept',
-      '-Wnoexcept-type',
-      '-Wnon-virtual-dtor',
-      '-Wold-style-cast',
-      '-Woverloaded-virtual',
-      '-Wplacement-new=2',
-      '-Wredundant-move',
-      '-Wredundant-tags',
-      '-Wregister',
-      '-Wsign-compare',
-      '-Wsign-promo',
-      '-Wsized-deallocation',
-      '-Wstrict-null-sentinel',
-      '-Wsuggest-final-methods',
-      '-Wsuggest-final-types',
-      '-Wsuggest-override',
-      '-Wuseless-cast',
-      '-Wvirtual-inheritance',
-      '-Wvolatile',
-      '-Wzero-as-null-pointer-constant',
-    ]
-
-  elif cpp.get_id() == 'msvc'
-    all_cpp_warnings += ['/Wall']
-  endif
-
-  all_cpp_warnings = cpp.get_supported_arguments(all_cpp_warnings)
-endif
diff --git a/meson_options.txt b/meson_options.txt
index 3210b0d..6472e14 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,9 @@
-# Copyright 2019-2022 David Robillard <d@drobilla.net>
+# Copyright 2019-2023 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR GPL-2.0-or-later
 
 option('benchmarks', type: 'feature', value: 'auto', yield: true,
        description: 'Build benchmarks')
 
-option('strict', type: 'boolean', value: false, yield: true,
-       description: 'Enable ultra-strict warnings')
-
 option('tests', type: 'feature', value: 'auto', yield: true,
        description: 'Build tests')
 
diff --git a/tools/meson.build b/tools/meson.build
index 1a12aba..5b25e61 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -10,6 +10,7 @@ foreach tool : tools
   executable(
     tool,
     files('@0@.cpp'.format(tool)),
+    cpp_args: cpp_suppressions,
     dependencies: [chilbert_dep],
   )
 endforeach