mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 21:35:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: don't use add_global_arguments()

Browse source 
.. 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.
This commit is contained in:
Tim-Philipp Müller 2018-02-21 19:20:56 +00:00
parent 388297735f
commit 5b18f7fa1f
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
meson.build
View file

@ -114,27 +114,19 @@ ges_c_args = ['-DHAVE_CONFIG_H']
plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
if gst_dep.type_name() == 'internal' if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_debug_disabled = subproject('gstreamer').get_variable('disable_gst_debug')
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
else else
# We can't check that in the case of subprojects as we won't # 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) # be able to build against an internal dependency (which is not built yet)
if not cc.compiles(''' gst_debug_disabled = not cc.compiles('''#include <gst/gstconfig.h>
#include <gst/gstconfig.h>
#ifdef GST_DISABLE_GST_DEBUG #ifdef GST_DISABLE_GST_DEBUG
#error "debugging disabled, make compiler fail" #error "debugging disabled, make compiler fail"
#endif''', dependencies: gst_dep) #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 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 endif
configinc = include_directories('.') configinc = include_directories('.')