mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 10:13:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: validate: actually pass extra arguments to gnome.generate_gir()

Browse source 
Especially the init section and the --quiet.

Remove the whole manual build/source dir include addition
to the g-ir-scanner args seeing that things worked fine
without the args being passed to the scanner at all.
This commit is contained in:
Tim-Philipp Müller 2019-03-23 19:48:29 +00:00
parent d99994a849
commit 9521fdbf88
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
validate/gst/validate/meson.build
View file

@ -77,14 +77,6 @@ gstvalidatetracer = library('gstvalidatetracer',
validate_gen_sources = [] validate_gen_sources = []
if build_gir if build_gir
gst_validate_gir_extra_args = gir_init_section + [ '--c-include=gst/validate/validate.h' ] gst_validate_gir_extra_args = gir_init_section + [ '--c-include=gst/validate/validate.h' ]
if meson.is_subproject()
# FIXME: There must be a better way to do this
# Need to pass the include path to find gst/gst.h and gst/gstenumtypes.h (built)
gst_validate_gir_extra_args += ['--cflags-begin',
'-I' + meson.current_source_dir() + '/../../',
'-I' + meson.current_build_dir() + '/../../',
'--cflags-end']
endif
validate_gen_sources = [gnome.generate_gir(gstvalidate, validate_gen_sources = [gnome.generate_gir(gstvalidate,
sources : gstvalidate_sources + gstvalidate_headers + gst_validate_enums, sources : gstvalidate_sources + gstvalidate_headers + gst_validate_enums,
nsversion : '1.0', nsversion : '1.0',
@ -100,6 +92,7 @@ if build_gir
'GstPbutils-' + apiversion], 'GstPbutils-' + apiversion],
install : true, install : true,
dependencies : [gst_dep, glib_dep, gio_dep, gst_pbutils_dep], dependencies : [gst_dep, glib_dep, gio_dep, gst_pbutils_dep],
extra_args : gst_validate_gir_extra_args,
)] )]
endif endif