From 98bfa2664067a2274c40431d94dc00b8f5e52f8f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 2 May 2023 15:04:23 -0400 Subject: Replace strict option with new meson warning level --- meson.build | 12 +-- meson/suppressions/meson.build | 85 +++++++++++---- meson/warnings/meson.build | 240 ----------------------------------------- meson_options.txt | 6 +- 4 files changed, 72 insertions(+), 271 deletions(-) delete mode 100644 meson/warnings/meson.build diff --git a/meson.build b/meson.build index a0d66d5..0335fec 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright 2021-2022 David Robillard +# Copyright 2021-2023 David Robillard # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later project('ganv', ['c', 'cpp'], @@ -27,11 +27,6 @@ gnome = import('gnome') cc = meson.get_compiler('c') 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(c_suppressions, language: ['c']) @@ -191,7 +186,7 @@ ganv_dep = declare_dependency( ) # Generage pkg-config file for external dependants -ganv_pc = pkg.generate( +pkg.generate( libganv, description: 'Interactive Gtk canvas widget for graph-based interfaces', extra_cflags: extra_args, @@ -201,6 +196,9 @@ ganv_pc = pkg.generate( version: meson.project_version(), ) +# Override pkg-config dependency for internal meson dependants +meson.override_dependency(versioned_name, ganv_dep) + # Install headers to a versioned include directory install_headers(c_headers + cpp_headers, subdir: versioned_name / 'ganv') diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index 914eab9..5185d42 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,14 +1,11 @@ -# Copyright 2020-2022 David Robillard +# Copyright 2020-2023 David Robillard # 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') clang_common_suppressions = [ - '-Wno-cast-function-type', '-Wno-cast-qual', '-Wno-covered-switch-default', '-Wno-disabled-macro-expansion', @@ -30,7 +27,6 @@ clang_common_suppressions = [ ] gcc_common_suppressions = [ - '-Wno-cast-function-type', '-Wno-cast-qual', '-Wno-conversion', '-Wno-deprecated-declarations', @@ -40,14 +36,12 @@ gcc_common_suppressions = [ '-Wno-format', '-Wno-implicit-fallthrough', '-Wno-padded', - '-Wno-pedantic', '-Wno-shadow', '-Wno-sign-conversion', '-Wno-suggest-attribute=const', '-Wno-suggest-attribute=pure', '-Wno-switch-default', '-Wno-switch-enum', - '-Wno-unsuffixed-float-constants', '-Wno-unused-macros', ] @@ -58,9 +52,9 @@ gcc_common_suppressions = [ if is_variable('cc') c_suppressions = [] - if get_option('strict') - if cc.get_id() == 'clang' - c_suppressions += clang_common_suppressions + [ + if cc.get_id() == 'clang' + if warning_level == 'everything' + c_suppressions += [ '-Wno-bad-function-cast', '-Wno-declaration-after-statement', '-Wno-documentation', @@ -71,14 +65,38 @@ if is_variable('cc') '-Wno-c11-extensions', ] endif + endif - elif cc.get_id() == 'gcc' - c_suppressions += gcc_common_suppressions + [ + if warning_level in ['everything', '3'] + c_suppressions += clang_common_suppressions + [ + '-Wno-cast-function-type', + '-Wno-pedantic', + ] + endif + + elif cc.get_id() == 'gcc' + if warning_level == 'everything' + c_suppressions += [ '-Wno-bad-function-cast', '-Wno-c++-compat', + '-Wno-unsuffixed-float-constants', + ] + endif + + if warning_level in ['everything', '3'] + c_suppressions += gcc_common_suppressions + [ + '-Wno-pedantic', ] + endif - elif cc.get_id() == 'msvc' + if warning_level in ['everything', '3', '2'] + c_suppressions += gcc_common_suppressions + [ + '-Wno-cast-function-type', + ] + endif + + elif cc.get_id() == 'msvc' + if warning_level == 'everything' c_suppressions += [ '/wd4061', # enumerator in switch is not explicitly handled '/wd4100', # unreferenced formal parameter @@ -109,9 +127,12 @@ endif if is_variable('cpp') cpp_suppressions = [] - if get_option('strict') - if cpp.get_id() == 'clang' - cpp_suppressions += clang_common_suppressions + [ + if cpp.get_id() == 'clang' + cpp_suppressions += clang_common_suppressions + + if warning_level == 'everything' + cpp_suppressions += [ + '-Wno-c++98-compat', '-Wno-exit-time-destructors', '-Wno-global-constructors', '-Wno-missing-noreturn', @@ -119,9 +140,19 @@ if is_variable('cpp') '-Wno-weak-vtables', '-Wno-zero-as-null-pointer-constant', ] + endif + + if warning_level in ['everything', '3'] + cpp_suppressions += [ + '-Wno-cast-function-type', + ] + endif - elif cpp.get_id() == 'gcc' - cpp_suppressions += gcc_common_suppressions + [ + elif cpp.get_id() == 'gcc' + cpp_suppressions += gcc_common_suppressions + + if warning_level == 'everything' + cpp_suppressions += [ '-Wno-effc++', '-Wno-missing-noreturn', '-Wno-null-dereference', @@ -131,6 +162,18 @@ if is_variable('cpp') '-Wno-zero-as-null-pointer-constant', ] endif + + if warning_level in ['everything', '3'] + cpp_suppressions += [ + '-Wno-pedantic', + ] + endif + + if warning_level in ['everything', '3', '2'] + cpp_suppressions += [ + '-Wno-cast-function-type', + ] + endif endif cpp_suppressions = cpp.get_supported_arguments(cpp_suppressions) diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build deleted file mode 100644 index a6975df..0000000 --- a/meson/warnings/meson.build +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 2020-2022 David Robillard -# 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') and not is_variable('all_c_warnings') - 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'] - endif - - all_c_warnings = cc.get_supported_arguments(all_c_warnings) - add_global_arguments(all_c_warnings, language: ['c']) -endif - -####### -# 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 79c1de1..69ae358 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,6 @@ +# Copyright 2022-2023 David Robillard +# SPDX-License-Identifier: 0BSD OR ISC + option('fdgl', type: 'feature', value: 'auto', yield: true, description: 'Build with force-directed graph layout support') @@ -13,9 +16,6 @@ option('light', type: 'boolean', value: 'false', yield: true, option('nls', type: 'feature', value: 'auto', yield: true, description: 'Build with native language support') -option('strict', type: 'boolean', value: false, yield: true, - description: 'Enable ultra-strict warnings') - option('title', type: 'string', value: 'Ganv', description: 'Project title') -- cgit v1.2.1