Merge branch 'feature/upstrem' into develop

1 files changed, 17 insertions, 1 deletions

diff --git a/meson.build b/meson.build
index 91f315d..9eb58cf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('shotwell', ['vala', 'c'],
-        version : '0.32.7',
+        version : '0.32.10',
         meson_version : '>= 0.59.0',
         default_options : ['buildtype=debugoptimized'])
 
@@ -20,9 +20,25 @@ config_incdir = include_directories('.')
 vapi_incdir = include_directories('vapi')
 shotwell_plugin_dir = join_paths(get_option('libdir'), 'shotwell', 'plugins', 'builtin')
 
+cc = meson.get_compiler('c')
+disabled_warning_flags = []
+if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+  disabled_warning_flags = cc.get_supported_arguments([
+    '-Wno-unused-but-set-variable', 
+    '-Wno-unused-variable',
+    '-Wno-incompatible-pointer-types',
+    '-Wno-discarded-qualifiers',
+    '-Wno-unused-label',
+    '-Wno-unused-function',
+    '-Wno-unused-value'
+  ])
+endif
+
+
 add_global_arguments(['-DHAVE_CONFIG_H=1'],
                      ['-include'], ['config.h'],
                      language : 'c')
+add_global_arguments(disabled_warning_flags, language: 'c')
 add_global_arguments(
     [
         '--target-glib=2.40',