From 3dd0018f230f4f1159d0e9dc7536c640e20d37b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 30 Mar 2020 22:01:38 +0200
Subject: [PATCH] build: Set default CFLAGS using meson's c_args

Meson supports checking for default arguments natively without having to
do this for each one, so just use this feature.

Not doing this will become a warning as per meson 0.52.0 [1].

[1] https://github.com/mesonbuild/meson/pull/5627
---
 meson.build | 80 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/meson.build b/meson.build
index e08b9a0..b86f376 100644
--- a/meson.build
+++ b/meson.build
@@ -5,6 +5,45 @@ project('fprintd', 'c',
         'buildtype=debugoptimized',
         'warning_level=1',
         'c_std=gnu99',
+        'c_args=' + ' '.join([
+            '-fno-strict-aliasing',
+            '-Wall',
+            '-Wcast-align',
+            '-Werror=address',
+            '-Werror=array-bounds',
+            '-Werror=empty-body',
+            '-Werror=implicit',
+            '-Werror=init-self',
+            '-Werror=int-to-pointer-cast',
+            '-Werror=main',
+            '-Werror=missing-braces',
+            '-Werror=nonnull',
+            '-Werror=pointer-to-int-cast',
+            '-Werror=redundant-decls',
+            '-Werror=return-type',
+            '-Werror=sequence-point',
+            '-Werror=trigraphs',
+            '-Werror=write-strings',
+            '-Wformat-nonliteral',
+            '-Wformat-security',
+            '-Wformat=2',
+            '-Wignored-qualifiers',
+            '-Wimplicit-function-declaration',
+            '-Wlogical-op',
+            '-Wmissing-declarations',
+            '-Wmissing-format-attribute',
+            '-Wmissing-include-dirs',
+            '-Wmissing-noreturn',
+            '-Wmissing-prototypes',
+            '-Wnested-externs',
+            '-Wold-style-definition',
+            '-Wpointer-arith',
+            '-Wshadow',
+            '-Wstrict-prototypes',
+            '-Wtype-limits',
+            '-Wundef',
+            '-Wunused',
+        ]),
     ],
     meson_version: '>= 0.50.0')
 
@@ -26,47 +65,6 @@ if get_option('prefix') != '/usr'
     sysconfdir = get_option('prefix') / sysconfdir
 endif
 
-common_cflags = cc.get_supported_arguments([
-    '-fno-strict-aliasing',
-    '-Wall',
-    '-Wcast-align',
-    '-Werror=address',
-    '-Werror=array-bounds',
-    '-Werror=empty-body',
-    '-Werror=implicit',
-    '-Werror=init-self',
-    '-Werror=int-to-pointer-cast',
-    '-Werror=main',
-    '-Werror=missing-braces',
-    '-Werror=nonnull',
-    '-Werror=pointer-to-int-cast',
-    '-Werror=redundant-decls',
-    '-Werror=return-type',
-    '-Werror=sequence-point',
-    '-Werror=trigraphs',
-    '-Werror=write-strings',
-    '-Wformat-nonliteral',
-    '-Wformat-security',
-    '-Wformat=2',
-    '-Wignored-qualifiers',
-    '-Wimplicit-function-declaration',
-    '-Wlogical-op',
-    '-Wmissing-declarations',
-    '-Wmissing-format-attribute',
-    '-Wmissing-include-dirs',
-    '-Wmissing-noreturn',
-    '-Wmissing-prototypes',
-    '-Wnested-externs',
-    '-Wold-style-definition',
-    '-Wpointer-arith',
-    '-Wshadow',
-    '-Wstrict-prototypes',
-    '-Wtype-limits',
-    '-Wundef',
-    '-Wunused',
-])
-add_project_arguments(common_cflags, language: 'c')
-
 # Dependencies
 glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
 gio_dep = dependency('gio-2.0', version: '>=' + glib_min_version)