From: Tim-Philipp Müller <tim@centricular.com>
Date: Wed, 21 Feb 2018 19:20:56 +0000 (+0000)
Subject: meson: don't use add_global_arguments()
X-Git-Tag: 1.19.3~493^2~745
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b18f7fa1f23832f07ff37bbe30c7098fd41d79e;p=platform%2Fupstream%2Fgstreamer.git

meson: don't use add_global_arguments()

.. and tighten check for disabled gst debugging sytem.

add_global_arguments() can't be used in subprojects. It's
entirely possible that ges is a subproject but gstreamer
is picked up from an installed location, so we should
really use add_project_arguments() in both cases.
---

diff --git a/meson.build b/meson.build
index a8602d7..1983721 100644
--- a/meson.build
+++ b/meson.build
@@ -114,27 +114,19 @@ ges_c_args = ['-DHAVE_CONFIG_H']
 plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
 
 if gst_dep.type_name() == 'internal'
-    gst_proj = subproject('gstreamer')
-
-    if gst_proj.get_variable('disable_gst_debug')
-        message('GStreamer debug system is disabled')
-        add_project_arguments('-Wno-unused', language: 'c')
-    else
-        message('GStreamer debug system is enabled')
-    endif
+  gst_debug_disabled = subproject('gstreamer').get_variable('disable_gst_debug')
 else
     # We can't check that in the case of subprojects as we won't
-    # be able to build against an internal dependency (which is not built yet)
-    if not cc.compiles('''
-#include <gst/gstconfig.h>
-#ifdef GST_DISABLE_GST_DEBUG
-#error "debugging disabled, make compiler fail"
-#endif''' , dependencies: gst_dep)
-        message('GStreamer debug system is disabled')
-        add_global_arguments('-Wno-unused', language: 'c')
-    else
-        message('GStreamer debug system is enabled')
-    endif
+  # be able to build against an internal dependency (which is not built yet)
+  gst_debug_disabled = not cc.compiles('''#include <gst/gstconfig.h>
+                                          #ifdef GST_DISABLE_GST_DEBUG
+                                          #error "debugging disabled, make compiler fail"
+                                          #endif''', dependencies: gst_dep)
+endif
+
+if gst_debug_disabled and cc.has_argument('-Wno-unused')
+  message('GStreamer debug system is disabled')
+  add_project_arguments('-Wno-unused', language: 'c')
 endif
 
 configinc = include_directories('.')