luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-28 01:56:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbus-2.0/codegen/meson.build
View File

@ -20,6 +20,8 @@ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
install_dir : get_option('bindir'), install_dir : get_option('bindir'),
configuration : gdbus_codegen_conf 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') codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')

2
gobject/meson.build
View File

@ -105,6 +105,8 @@ foreach tool: python_tools
# Set variables for later use # Set variables for later use
set_variable(tool.underscorify(), tool_bin) 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 endforeach
executable('gobject-query', 'gobject-query.c', executable('gobject-query', 'gobject-query.c',