Merge branch 'nirbheek/override-find-program' into 'master'

meson: Provide our Python tools for builds

See merge request GNOME/glib!188
This commit is contained in:
Xavier Claessens 2018-07-20 18:24:09 +00:00
commit c46afdbc13
2 changed files with 4 additions and 0 deletions

View File

@ -20,6 +20,8 @@ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
install_dir : get_option('bindir'),
configuration : gdbus_codegen_conf
)
# Provide tools for others when we're a subproject and they use the Meson GNOME module
meson.override_find_program('gdbus-codegen', gdbus_codegen)
codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')

View File

@ -105,6 +105,8 @@ foreach tool: python_tools
# Set variables for later use
set_variable(tool.underscorify(), tool_bin)
# Provide tools for others when we're a subproject and they use the Meson GNOME module
meson.override_find_program(tool, tool_bin)
endforeach
executable('gobject-query', 'gobject-query.c',