[balsa] meson.build: Bump default version to 2.5.7



commit a8784c9c0c67c0c09930eb5da5f8412f713dda7d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon May 27 13:48:55 2019 -0400

    meson.build: Bump default version to 2.5.7
    
    * meson.build: Bump default version to 2.5.7;
      use compiler.get_supported_arguments() to check all arguments at once,
      instead of looping through a list and checking them one at a time.

 ChangeLog   |  6 ++++++
 meson.build | 42 ++++++++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 02c95d26f..455bf5a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-27  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       * meson.build: Bump default version to 2.5.7;
+         use compiler.get_supported_arguments() to check all arguments at once,
+         instead of looping through a list and checking them one at a time.
+
 2019-05-26  Pawel Salek  <pawsa0 gmail com>
 
        * NEWS, configure.ac: correct typos; bump version base for git builds.
diff --git a/meson.build b/meson.build
index 82aafc1c1..dc052f4fa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('balsa', 'c',
-        version         : '2.5.5',
+        version         : '2.5.7',
         default_options : 'sysconfdir=/etc')
 
 # if meson is used not in a git source tree, use project version:
@@ -489,27 +489,33 @@ endif
 # set more warnings.
 #
 
-if compiler.get_id() == 'gcc' and more_warnings
-  foreach argument : ['-Wsign-compare',
-                      '-Wpointer-arith',
-                      '-Wnested-externs',
-                      '-Wchar-subscripts',
-                      '-Wuninitialized',
-                      '-Wmissing-prototypes',
-                      '-Wreturn-type',
-                      '-Wdeclaration-after-statement']
-    if compiler.has_argument(argument)
-      add_global_arguments(argument, language : 'c')
-    endif
-  endforeach
-endif
+if more_warnings
+  # meson sets -Wall, so we do not need these:
+  # '-Wsign-compare',
+  # '-Wchar-subscripts',
+  # '-Wuninitialized',
+  # '-Wreturn-type',
+  args = compiler.get_supported_arguments([
+    '-Wpointer-arith',
+    '-Wnested-externs',
+    '-Wmissing-prototypes',
+    '-Wdeclaration-after-statement',
+  ])
+  add_global_arguments(args, language : 'c')
+endif # more_warnings
 
 # extra warnings for GIT.
 #
 if balsa_from_git
-  add_global_arguments('-Wall', '-Werror', '-Wdeprecated-declarations', language : 'c')
-  add_global_arguments('-DGMIME_DISABLE_DEPRECATED', language : 'c')
-  add_global_arguments('-O2', '-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=2', language : 'c')
+  args = compiler.get_supported_arguments([
+    '-Werror',
+    '-Wdeprecated-declarations',
+    '-DGMIME_DISABLE_DEPRECATED',
+    '-O2',
+    '-U_FORTIFY_SOURCE',
+    '-D_FORTIFY_SOURCE=2',
+  ])
+  add_global_arguments(args, language : 'c')
 endif # balsa_from_git
 
 #####################################################################


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]