meson.build: Avoid configuration warnings

kjellahl · kjellahl · commit 5fd04f33fb2d · 2022-05-02T10:01:31.000+02:00
diff --git a/.github/workflows/meson-clang-10.yml b/.github/workflows/meson-clang-10.yml
@@ -20,7 +20,7 @@ jobs:
         sudo pip3 install "meson>=0.55.0"
         export CC=clang-10
         export CXX=clang++-10
-        meson -Dwarnings=fatal _build
+        meson -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
         cd _build
         meson compile
     - name: Test
diff --git a/.github/workflows/meson-gcc-10.yml b/.github/workflows/meson-gcc-10.yml
@@ -20,7 +20,7 @@ jobs:
         sudo pip3 install "meson>=0.55.0"
         export CC=gcc-10
         export CXX=g++-10
-        meson -Dwarnings=fatal _build
+        meson -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true _build
         cd _build
         meson compile
     - name: Test
diff --git a/meson.build b/meson.build
@@ -74,10 +74,12 @@ maintainer_mode = maintainer_mode_opt == 'true' or \
 if is_dist_check
   message('Looks like a tarball is being tested. ' + \
     'Option "dist-warnings" is used instead of "warnings".')
-  warning_level = get_option('dist-warnings')
+  cpp_warnings = get_option('dist-warnings')
 else
-  warning_level = get_option('warnings')
+  cpp_warnings = get_option('warnings')
 endif
+warning_level = get_option('warning_level').to_int()
+werror = get_option('werror')
 build_deprecated_api = get_option('build-deprecated-api')
 build_documentation_opt = get_option('build-documentation')
 build_documentation = build_documentation_opt == 'true' or \
@@ -227,14 +229,31 @@ endif
 xmlxx_libname = 'xml++' + msvc14x_toolset_ver + '-' + xmlxx_api_version
 
 # Set compiler warnings.
+# Meson warns if any of the /W1, /W2, /W3, /W4, /Wall, -Wall, -Wextra, -Werror
+# compiler options are added with add_project_arguments().
+# Avoid such warnings, when possible.
+# See _warn_about_builtin_args() in meson/mesonbuild/interpreter/interpreter.py.
 warning_flags = []
-if warning_level == 'max' or warning_level == 'fatal'
-  if is_msvc
-    warning_flags = ['/W4']
-  else
-    warning_flags = '-pedantic -Wall -Wextra -Wformat-security -Wsuggest-override -Wshadow -Wno-long-long'.split()
+if cpp_warnings == 'min'
+  if warning_level == 0
+    if is_msvc
+      warning_flags = ['/W2']
+    else
+      warning_flags = ['-Wall']
+    endif
+  endif
+elif cpp_warnings == 'max' or cpp_warnings == 'fatal'
+  if warning_level < 3
+    if is_msvc
+      warning_flags = ['/W4']
+    else
+      warning_flags = ['-pedantic', '-Wall', '-Wextra']
+    endif
+  endif
+  if not is_msvc
+    warning_flags += '-Wformat-security -Wsuggest-override -Wshadow -Wno-long-long'.split()
   endif
-  if warning_level == 'fatal'
+  if cpp_warnings == 'fatal' and not werror
     if is_msvc
       warning_flags += ['/WX']
     else
@@ -387,7 +406,8 @@ summary = [
   meson.project_name() + ' ' + meson.project_version(),
   '',
   '         Maintainer mode: @0@@1@'.format(maintainer_mode_opt, real_maintainer_mode),
-  '       Compiler warnings: @0@'.format(warning_level),
+  '       Compiler warnings: @0@ (warning_level: @1@, werror: @2@)'. \
+                             format(cpp_warnings, warning_level, werror),
   '    Build deprecated API: @0@'.format(build_deprecated_api),
   'Build HTML documentation: @0@@1@'.format(build_documentation_opt, real_build_documentation),
   '          XML validation: @0@@1@'.format(validate, explain_val),
