Replace strict option with new meson warning level

4 files changed, 36 insertions, 211 deletions

diff --git a/meson.build b/meson.build
index 5c3f2dd6..581facbe 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
+# Copyright 2020-2023 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
 
 project('ingen', 'cpp',
@@ -23,11 +23,6 @@ versioned_name = '@0@-@1@'.format(meson.project_name(), major_version)
 # Required tools
 cpp = meson.get_compiler('cpp')
 
-# Set global warning flags
-if get_option('strict') and not meson.is_subproject()
-  subdir('meson/warnings')
-endif
-
 # Set global warning suppressions
 subdir('meson/suppressions')
 add_project_arguments(cpp_suppressions, language: ['cpp'])
@@ -103,7 +98,7 @@ platform_defines += ['-DHAVE_SOCKET=@0@'.format(have_socket.to_int())]
 # Common Dependencies #
 #######################
 
-boost_dep = dependency('boost')
+boost_dep = dependency('boost', include_type: 'system')
 thread_dep = dependency('threads')
 
 serd_dep = dependency(
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index b3884c18..3d6fb28f 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -1,11 +1,9 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
+# Copyright 2020-2023 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
 
-# Project-specific warning suppressions.
-#
-# This should be used in conjunction with the generic "warnings" sibling that
-# enables all reasonable warnings for the compiler.  It lives here just to keep
-# the top-level meson.build more readable.
+# Project-specific warning suppressions
+
+warning_level = get_option('warning_level')
 
 #######
 # C++ #
@@ -14,10 +12,12 @@
 if is_variable('cpp')
   cpp_suppressions = []
 
-  if get_option('strict')
-    if cpp.get_id() == 'clang'
+  if cpp.get_id() == 'clang'
+    if warning_level == 'everything'
       cpp_suppressions = [
         '-Wno-c++17-extensions',
+        '-Wno-c++98-compat',
+        '-Wno-c++98-compat-pedantic',
         '-Wno-cast-align',
         '-Wno-cast-qual',
         '-Wno-documentation-unknown-command',
@@ -27,19 +27,22 @@ if is_variable('cpp')
         '-Wno-format-nonliteral',
         '-Wno-global-constructors',
         '-Wno-implicit-float-conversion',
-        '-Wno-nullability-extension',
         '-Wno-padded',
         '-Wno-reserved-id-macro',
         '-Wno-shorten-64-to-32',
         '-Wno-sign-conversion',
         '-Wno-switch-enum',
         '-Wno-unreachable-code',
-        '-Wno-unused-parameter',
         '-Wno-vla',
-        '-Wno-vla-extension',
         '-Wno-weak-vtables',
       ]
 
+      if not meson.is_cross_build()
+        cpp_suppressions += [
+          '-Wno-poison-system-directories',
+        ]
+      endif
+
       if host_machine.system() in ['darwin', 'freebsd']
         cpp_suppressions += [
           '-Wno-comma', # boost
@@ -56,8 +59,18 @@ if is_variable('cpp')
           '-Wno-zero-as-null-pointer-constant', # boost
         ]
       endif
+    endif
+
+    if warning_level in ['everything', '3']
+      cpp_suppressions += [
+        '-Wno-unused-parameter',
+        '-Wno-vla-extension',
+        '-Wno-nullability-extension',
+      ]
+    endif
 
-    elif cpp.get_id() == 'gcc'
+  elif cpp.get_id() == 'gcc'
+    if warning_level == 'everything'
       cpp_suppressions = [
         '-Wno-abi-tag',
         '-Wno-alloc-zero',
@@ -90,8 +103,13 @@ if is_variable('cpp')
         '-Wno-switch-enum',
         '-Wno-unreachable-code',
         '-Wno-unused-const-variable',
-        '-Wno-unused-parameter',
         '-Wno-useless-cast',
+      ]
+    endif
+
+    if warning_level in ['everything', '3']
+      cpp_suppressions += [
+        '-Wno-unused-parameter',
         '-Wno-vla',
       ]
     endif
diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build
deleted file mode 100644
index a28d2a2c..00000000
--- a/meson/warnings/meson.build
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: 0BSD OR GPL-3.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:
-#
-# 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)
-  add_global_arguments(all_cpp_warnings, language: ['cpp'])
-endif
diff --git a/meson_options.txt b/meson_options.txt
index 624285f1..686898a9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,6 @@
+# Copyright 2020-2023 David Robillard <d@drobilla.net>
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
+
 option('bindings_py', type: 'feature', value: 'auto', yield: true,
        description: 'Build Python bindings')
 
@@ -19,8 +22,5 @@ option('lv2dir', type: 'string', value: '', yield: true,
 option('portaudio', type: 'feature', value: 'auto', yield: true,
        description: 'Build PortAudio driver')
 
-option('strict', type: 'boolean', value: false, yield: true,
-       description: 'Enable ultra-strict warnings')
-
 option('title', type: 'string', value: 'Ingen',
        description: 'Project title')