From 9521fdbf887970b096b9c914228a3008c3d4b259 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 23 Mar 2019 19:48:29 +0000 Subject: [PATCH] meson: validate: actually pass extra arguments to gnome.generate_gir() 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. --- validate/gst/validate/meson.build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/validate/gst/validate/meson.build b/validate/gst/validate/meson.build index e44874a..f361330 100644 --- a/validate/gst/validate/meson.build +++ b/validate/gst/validate/meson.build @@ -77,14 +77,6 @@ gstvalidatetracer = library('gstvalidatetracer', validate_gen_sources = [] if build_gir 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, sources : gstvalidate_sources + gstvalidate_headers + gst_validate_enums, nsversion : '1.0', @@ -100,6 +92,7 @@ if build_gir 'GstPbutils-' + apiversion], install : true, dependencies : [gst_dep, glib_dep, gio_dep, gst_pbutils_dep], + extra_args : gst_validate_gir_extra_args, )] endif -- 2.7.4