diff options
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 170 | ||||
| -rw-r--r-- | meson/warnings/meson.build | 175 | ||||
| -rw-r--r-- | meson_options.txt | 3 | ||||
| -rw-r--r-- | test/meson.build | 2 |
5 files changed, 96 insertions, 257 deletions
diff --git a/meson.build b/meson.build index 7c0096b..8894be4 100644 --- a/meson.build +++ b/meson.build @@ -25,9 +25,6 @@ pkg = import('pkgconfig') cc = meson.get_compiler('c') # Set global warning flags -if get_option('strict') and not meson.is_subproject() - subdir('meson/warnings') -endif subdir('meson/suppressions') # Build as C++ with MSVC diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index 1be55fe..b5b5e01 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,100 +1,120 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -# 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 # ##### -if is_variable('cc') - c_suppressions = [] - - if get_option('strict') - if cc.get_id() == 'clang' - c_suppressions += [ - '-Wno-cast-align', - '-Wno-cast-qual', - '-Wno-conversion', - '-Wno-declaration-after-statement', - '-Wno-double-promotion', - '-Wno-format-nonliteral', - '-Wno-nullability-extension', - '-Wno-nullable-to-nonnull-conversion', - '-Wno-padded', - '-Wno-reserved-id-macro', - '-Wno-sign-conversion', - '-Wno-switch-enum', - '-Wno-unused-macros', - ] +c_suppressions = [] - if host_machine.system() == 'freebsd' - c_suppressions += [ - '-Wno-c11-extensions', - ] - endif +if cc.get_id() in ['clang', 'emscripten'] + if warning_level == 'everything' + c_suppressions += [ + '-Wno-cast-align', + '-Wno-cast-qual', + '-Wno-conversion', + '-Wno-declaration-after-statement', + '-Wno-double-promotion', + '-Wno-format-nonliteral', + '-Wno-nullable-to-nonnull-conversion', + '-Wno-padded', + '-Wno-reserved-id-macro', + '-Wno-sign-conversion', + '-Wno-switch-enum', + '-Wno-unused-macros', + ] + endif - if host_machine.system() == 'windows' - c_suppressions += [ - '-Wno-deprecated-declarations', - '-Wno-nonportable-system-include-path', - ] - endif + if warning_level in ['everything', '3'] + c_suppressions += [ + '-Wno-nullability-extension', + ] - elif cc.get_id() == 'gcc' + if host_machine.system() == 'freebsd' c_suppressions += [ - '-Wno-cast-align', - '-Wno-cast-qual', - '-Wno-format-nonliteral', - '-Wno-inline', - '-Wno-padded', - '-Wno-sign-conversion', - '-Wno-strict-overflow', - '-Wno-suggest-attribute=const', - '-Wno-suggest-attribute=pure', - '-Wno-switch-default', - '-Wno-switch-enum', - '-Wno-unsuffixed-float-constants', - '-Wno-unused-const-variable', - '-Wno-unused-macros', + '-Wno-c11-extensions', ] + endif - if host_machine.system() == 'windows' - c_suppressions += [ - '-Wno-float-conversion', - '-Wno-suggest-attribute=format', - ] - endif - - elif cc.get_id() == 'msvc' + if host_machine.system() == 'windows' c_suppressions += [ - '/wd4061', # enumerator in switch is not explicitly handled - '/wd4200', # zero-sized array in struct/union - '/wd4365', # signed/unsigned mismatch - '/wd4514', # unreferenced inline function has been removed - '/wd4706', # assignment within conditional expression - '/wd4710', # function not inlined - '/wd4711', # function selected for automatic inline expansion - '/wd4800', # implicit conversion from int to bool - '/wd4820', # padding added after construct - '/wd4996', # POSIX name for this item is deprecated - '/wd4996', # function or variable may be unsafe - '/wd5045', # will insert Spectre mitigation for memory load - '/wd5264', # const variable is not used + '-Wno-deprecated-declarations', + '-Wno-nonportable-system-include-path', ] endif endif - if cc.get_id() == 'gcc' and host_machine.system() == 'windows' +elif cc.get_id() == 'gcc' + if warning_level == 'everything' + c_suppressions += [ + '-Wno-cast-align', + '-Wno-cast-qual', + '-Wno-format-nonliteral', + '-Wno-inline', + '-Wno-padded', + '-Wno-sign-conversion', + '-Wno-strict-overflow', + '-Wno-suggest-attribute=const', + '-Wno-suggest-attribute=pure', + '-Wno-switch-default', + '-Wno-switch-enum', + '-Wno-unsuffixed-float-constants', + '-Wno-unused-const-variable', + '-Wno-unused-macros', + ] + endif + + if warning_level in ['everything', '3'] c_suppressions += [ '-Wno-format', ] endif - c_suppressions = cc.get_supported_arguments(c_suppressions) + if host_machine.system() == 'windows' + c_suppressions += [ + '-Wno-float-conversion', + '-Wno-suggest-attribute=format', + ] + endif + +elif cc.get_id() == 'msvc' + c_suppressions += [ + '/experimental:external', + '/external:W0', + '/external:anglebrackets', + ] + + if warning_level == 'everything' + c_suppressions += [ + '/wd4061', # enumerator in switch is not explicitly handled + '/wd4200', # zero-sized array in struct/union + '/wd4365', # signed/unsigned mismatch + '/wd4514', # unreferenced inline function has been removed + '/wd4710', # function not inlined + '/wd4711', # function selected for automatic inline expansion + '/wd4800', # implicit conversion from int to bool + '/wd4820', # padding added after construct + '/wd4996', # POSIX name for this item is deprecated + '/wd5045', # will insert Spectre mitigation for memory load + '/wd5264', # const variable is not used + ] + endif + + if warning_level in ['everything', '3'] + c_suppressions += [ + '/wd4706', # assignment within conditional expression + ] + endif + + if warning_level in ['everything', '3', '2'] + c_suppressions += [ + '/wd4996', # function or variable may be unsafe + ] + endif endif +c_suppressions = cc.get_supported_arguments(c_suppressions) diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build deleted file mode 100644 index 80d5774..0000000 --- a/meson/warnings/meson.build +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: 0BSD OR ISC - -# 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 warnings that apply to all C-family languages -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('cc') - # Set all_c_warnings for the current C compiler - all_c_warnings = [] - - if cc.get_id() == 'clang' - all_c_warnings += ['-Weverything'] - - if not meson.is_cross_build() - all_c_warnings += [ - '-Wno-poison-system-directories', - ] - endif - - elif cc.get_id() == 'gcc' - all_c_warnings += gcc_common_warnings + [ - '-Wabsolute-value', - '-Wbad-function-cast', - '-Wc++-compat', - '-Wenum-conversion', - '-Wjump-misses-init', - '-Wmissing-parameter-type', - '-Wmissing-prototypes', - '-Wnested-externs', - '-Wold-style-declaration', - '-Wold-style-definition', - '-Woverride-init', - '-Wsign-compare', - '-Wstrict-prototypes', - '-Wunsuffixed-float-constants', - ] - - elif cc.get_id() == 'msvc' - all_c_warnings += [ - '/Wall', - '/experimental:external', - '/external:W0', - '/external:anglebrackets', - ] - endif - - all_c_warnings = cc.get_supported_arguments(all_c_warnings) - add_global_arguments(all_c_warnings, language: ['c']) -endif diff --git a/meson_options.txt b/meson_options.txt index 10bbd76..257c045 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,9 +4,6 @@ option('docs', type: 'feature', value: 'auto', yield: true, description: 'Build documentation') -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/test/meson.build b/test/meson.build index f5504c4..f04293a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -5,7 +5,7 @@ # Project Metadata # #################### -if get_option('strict') +if get_option('warning_level') == 'everything' # Check release metadata if not meson.is_subproject() autoship = find_program('autoship', required: false) |