mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
meson: build gir even when cross-compiling if introspection was enabled explicitly
This can be made to work in certain circumstances when cross-compiling, so default to not building g-i stuff when cross-compiling, but allow it if introspection was enabled explicitly via -Dintrospection=enabled. Fixes #454 and #381.
This commit is contained in:
parent
10d9e18f02
commit
35db4a2433
1 changed files with 1 additions and 1 deletions
|
@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false)
|
||||||
gir = find_program('g-ir-scanner', required : get_option('introspection'))
|
gir = find_program('g-ir-scanner', required : get_option('introspection'))
|
||||||
gnome = import('gnome')
|
gnome = import('gnome')
|
||||||
|
|
||||||
build_gir = gir.found() and not meson.is_cross_build()
|
build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
|
||||||
|
|
||||||
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
|
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
|
||||||
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
|
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
|
||||||
|
|
Loading…
Reference in a new issue