luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'override' into 'master'

Browse Source 
Meson: Override glib-compile-resources/schemas

See merge request GNOME/glib!1037
This commit is contained in:
Philip Withnall 2019-08-23 11:30:46 +00:00
commit 3c9ff2712f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/meson.build
View File

@ -963,6 +963,14 @@ glib_compile_resources = executable('glib-compile-resources',
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
# Cannot override those programs in cross compilation case because they are
# native executables that cannot be run on the build machine.
# See https://gitlab.gnome.org/GNOME/glib/issues/1859.
if not meson.is_cross_build()
meson.override_find_program('glib-compile-schemas', glib_compile_schemas)
meson.override_find_program('glib-compile-resources', glib_compile_resources)
endif
executable('gsettings', 'gsettings-tool.c',
install : true,
c_args : gio_c_args,