From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 13 Feb 2019 17:36:48 +0000 (+0100)
Subject: meson: use add_project_arguments
X-Git-Tag: v4.0.0~24^2~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ec2282fc75e16af7dfca9962624806399fb100a;p=thirdparty%2Fknot-resolver.git

meson: use add_project_arguments
---

diff --git a/client/meson.build b/client/meson.build
index 7d8646154..cbbabf677 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -31,7 +31,6 @@ if build_client
       libkres_dep,
       libedit,
     ],
-    c_args: c_args,
     install: true,
     install_dir: get_option('sbindir'),
   )
diff --git a/contrib/meson.build b/contrib/meson.build
index e980d1114..0c7aeb1ca 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -18,7 +18,6 @@ contrib_lib = static_library(
   contrib_src,
   include_directories: contrib_inc,
   dependencies: libknot,
-  c_args: c_args,
 )
 
 contrib_dep = declare_dependency(
diff --git a/daemon/meson.build b/daemon/meson.build
index 0cde203ed..902f11494 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -47,7 +47,6 @@ kresd = executable(
   kresd_src,
   dependencies: kresd_deps,
   export_dynamic: true,
-  c_args: c_args,
   install: true,
   install_dir: get_option('sbindir'),
 )
diff --git a/lib/meson.build b/lib/meson.build
index f26036309..20d97bed5 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -87,7 +87,6 @@ libkres_lib = library('kres',
     gnutls,
     luajit,
   ],
-  c_args: c_args,
   install: true,
 )
 
diff --git a/meson.build b/meson.build
index 8d28e5988..a6250284f 100644
--- a/meson.build
+++ b/meson.build
@@ -89,15 +89,14 @@ endif
 message('---------------------------')
 
 ## Compiler args
-c_args = [
+add_project_arguments([
   '-D_GNU_SOURCE',
-  '-Wtype-limits',
-  '-Wformat',
   '-Wformat-security',
+  '-Wtype-limits',
   '-Wshadow',
   '-Wall',
   '-fvisibility=hidden',
-]
+])
 
 # Lists of tests
 # These lists are added to from subdir() and finally used in tests/*
diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index d2336ceca..08419b1e3 100644
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -13,7 +13,6 @@ bogus_log_mod = shared_module(
     libknot,
   ],
   name_prefix: '',
-  c_args: c_args,
   install: true,
   install_dir: modules_dir,
 )
diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index 84ef35071..2db216c35 100644
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -41,7 +41,6 @@ if libprotobuf_c.found() and libfstrm.found() and protoc_c.found()
       libprotobuf_c,
     ],
     name_prefix: '',
-    c_args: c_args,
     install: true,
     install_dir: modules_dir,
   )
diff --git a/modules/edns_keepalive/meson.build b/modules/edns_keepalive/meson.build
index 1f649481e..f94c0cc59 100644
--- a/modules/edns_keepalive/meson.build
+++ b/modules/edns_keepalive/meson.build
@@ -13,7 +13,6 @@ edns_keepalive_mod = shared_module(
     libknot,
   ],
   name_prefix: '',
-  c_args: c_args,
   install: true,
   install_dir: modules_dir,
 )
diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index 83e653673..41fa0c3d7 100644
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -14,7 +14,6 @@ hints_mod = shared_module(
     luajit,
   ],
   name_prefix: '',
-  c_args: c_args,
   install: true,
   install_dir: modules_dir,
 )
diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index c719721a7..1b796bb03 100644
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -14,7 +14,6 @@ nsid_mod = shared_module(
     luajit,
   ],
   name_prefix: '',
-  c_args: c_args,
   install: true,
   install_dir: modules_dir,
 )
diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index b790e2e38..769b867aa 100644
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -14,7 +14,6 @@ stats_mod = shared_module(
     luajit,
   ],
   name_prefix: '',
-  c_args: c_args,
   install: true,
   install_dir: modules_dir,
 )
diff --git a/tests/pytests/meson.build b/tests/pytests/meson.build
index 80b5a1b21..4db8ad88e 100644
--- a/tests/pytests/meson.build
+++ b/tests/pytests/meson.build
@@ -14,7 +14,6 @@ tlsproxy = executable(
     libuv,
     gnutls,
   ],
-  c_args: c_args,
 )
 
 # python 3 dependencies
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index d05e6b0e0..43ca76750 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -27,7 +27,6 @@ foreach unit_test : unit_tests
       cmocka,
       lmdb,
     ],
-    c_args: c_args,
   )
   test(
     'unit.' + unit_test[0],