From 0534897c68317cfc12cde0ae3af6683350fd08b0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 12 Nov 2024 18:04:05 -0500 Subject: Move warning suppression flags to main meson file --- meson.build | 91 ++++++++++++++++++++++++++++++++++- meson/suppressions/meson.build | 107 ----------------------------------------- 2 files changed, 89 insertions(+), 109 deletions(-) delete mode 100644 meson/suppressions/meson.build diff --git a/meson.build b/meson.build index 2a05f8a6..f674bfa4 100644 --- a/meson.build +++ b/meson.build @@ -29,8 +29,95 @@ versioned_name = 'serd' + version_suffix pkg = import('pkgconfig') cc = meson.get_compiler('c') -# Set global warning flags -subdir('meson/suppressions') +# Set global warning suppressions +warning_level = get_option('warning_level') +c_suppressions = [] +if cc.get_id() in ['clang', 'emscripten'] + if warning_level == 'everything' + c_suppressions += [ + '-Wno-cast-align', + '-Wno-cast-function-type-strict', + '-Wno-cast-qual', + '-Wno-declaration-after-statement', + '-Wno-double-promotion', + '-Wno-format-nonliteral', + '-Wno-padded', + '-Wno-switch-default', + '-Wno-unsafe-buffer-usage', + ] + + if host_machine.system() == 'windows' + c_suppressions += [ + '-Wno-deprecated-declarations', + '-Wno-nonportable-system-include-path', + '-Wno-unused-macros', + ] + endif + endif + + if warning_level in ['everything', '3'] + c_suppressions += ['-Wno-nullability-extension'] + + if host_machine.system() == 'freebsd' + c_suppressions += ['-Wno-c11-extensions'] + endif + endif + + if not meson.is_cross_build() + c_suppressions += ['-Wno-poison-system-directories'] + endif + +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-switch-default', + '-Wno-unsuffixed-float-constants', + '-Wno-unused-const-variable', + ] + + if host_machine.system() == 'windows' + c_suppressions += ['-Wno-float-conversion'] + endif + 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 + '/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 + '/wd5045', # will insert Spectre mitigation for memory load + ] + 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', # POSIX name for this item is deprecated + ] + endif +endif + +c_suppressions = cc.get_supported_arguments(c_suppressions) ################ # Dependencies # diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build deleted file mode 100644 index 461a7128..00000000 --- a/meson/suppressions/meson.build +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 2020-2024 David Robillard -# SPDX-License-Identifier: 0BSD OR ISC - -# Project-specific warning suppressions - -warning_level = get_option('warning_level') - -##### -# C # -##### - -if is_variable('cc') - c_suppressions = [] - - if cc.get_id() in ['clang', 'emscripten'] - if warning_level == 'everything' - c_suppressions += [ - '-Wno-cast-align', - '-Wno-cast-function-type-strict', - '-Wno-cast-qual', - '-Wno-declaration-after-statement', - '-Wno-double-promotion', - '-Wno-format-nonliteral', - '-Wno-padded', - '-Wno-switch-default', - '-Wno-unsafe-buffer-usage', - ] - - if host_machine.system() == 'windows' - c_suppressions += [ - '-Wno-deprecated-declarations', - '-Wno-nonportable-system-include-path', - '-Wno-unused-macros', - ] - endif - endif - - if warning_level in ['everything', '3'] - c_suppressions += [ - '-Wno-nullability-extension', - ] - - if host_machine.system() == 'freebsd' - c_suppressions += [ - '-Wno-c11-extensions', - ] - endif - endif - - if not meson.is_cross_build() - c_suppressions += ['-Wno-poison-system-directories'] - endif - - 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-switch-default', - '-Wno-unsuffixed-float-constants', - '-Wno-unused-const-variable', - ] - - if host_machine.system() == 'windows' - c_suppressions += [ - '-Wno-float-conversion', - ] - endif - 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 - '/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 - '/wd5045', # will insert Spectre mitigation for memory load - ] - 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', # POSIX name for this item is deprecated - ] - endif - endif - - c_suppressions = cc.get_supported_arguments(c_suppressions) -endif -- cgit v1.2.1