mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 22:21:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Update option names to omit disable_ and with- prefixes

Browse source 
Also yield common options to the outer project (gst-build in our case)
so that they don't have to be set manually.
This commit is contained in:
Nirbheek Chauhan 2018-05-05 19:34:14 +05:30
parent b99ddc53ef
commit b74edb98b3
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -103,7 +103,7 @@ gir = find_program('g-ir-scanner', required : false)
gnome = import('gnome') gnome = import('gnome')
# Fixme, not very elegant. # Fixme, not very elegant.
build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection') build_gir = gir.found() and not meson.is_cross_build() and get_option('introspection')
gir_init_section = [ '--add-init-section=' + \ gir_init_section = [ '--add-init-section=' + \
'extern void gst_init(gint*,gchar**);' + \ 'extern void gst_init(gint*,gchar**);' + \
'extern void ges_init(void);' + \ 'extern void ges_init(void);' + \
@ -118,7 +118,7 @@ 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_debug_disabled = subproject('gstreamer').get_variable('disable_gst_debug') gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')
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)
@ -162,7 +162,7 @@ subdir('examples')
if build_machine.system() == 'windows' if build_machine.system() == 'windows'
message('Disabling gtk-doc while building on Windows') message('Disabling gtk-doc while building on Windows')
elif get_option('disable_gtkdoc') elif not get_option('gtkdoc')
message('gtk-doc is disabled via options') message('gtk-doc is disabled via options')
else else
if find_program('gtkdoc-scan', required : false).found() if find_program('gtkdoc-scan', required : false).found()

10
meson_options.txt
View file

@ -1,6 +1,4 @@
option('disable_introspection', option('introspection', type : 'boolean', value : true, yield : true,
type : 'boolean', value : false, description : 'Generate gobject-introspection bindings')
description : 'Whether to disable the introspection generation') option('gtkdoc', type : 'boolean', value : true, yield : true,
option('disable_gtkdoc', description : 'Build API documentation with gtk-doc')
type : 'boolean', value : false,
description : 'Whether to disable the documentation generation')