mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 16:26:39 +00:00
meson: simplify GST_DISABLE_GST_DEBUG check and don't use add_global_*
add_global_arguments() can't be used in subprojects. It's entirely possible that -bad 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:
parent
a73e5eba55
commit
9af73aa1d1
1 changed files with 8 additions and 20 deletions
28
meson.build
28
meson.build
|
@ -425,27 +425,15 @@ else
|
|||
endif
|
||||
|
||||
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
|
||||
# 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)
|
||||
gst_debug_disabled = cc.has_header_symbol('gst/gstconfig.h', 'GST_DISABLE_GST_DEBUG', dependencies: gst_dep)
|
||||
endif
|
||||
|
||||
if gst_debug_disabled and cc.has_argument('-Wno-unused')
|
||||
add_project_arguments('-Wno-unused', language: 'c')
|
||||
endif
|
||||
|
||||
gst_plugins_bad_args = ['-DHAVE_CONFIG_H']
|
||||
|
|
Loading…
Reference in a new issue