Merge branch 'fix-meson' into 'main'

Fix typo in gio/meson.build

Closes gtk#4918

See merge request GNOME/glib!2655
This commit is contained in:
Xavier Claessens 2022-05-14 13:23:17 +00:00
commit 5718d15af7

View File

@ -978,7 +978,7 @@ glib_compile_resources = executable('glib-compile-resources',
# Cannot override those programs in cross compilation case because they are # Cannot override those programs in cross compilation case because they are
# native executables that cannot be run on the build machine. # native executables that cannot be run on the build machine.
# See https://gitlab.gnome.org/GNOME/glib/issues/1859. # See https://gitlab.gnome.org/GNOME/glib/issues/1859.
if not meson.can_run_host_binaries() if meson.can_run_host_binaries()
meson.override_find_program('glib-compile-schemas', glib_compile_schemas) meson.override_find_program('glib-compile-schemas', glib_compile_schemas)
meson.override_find_program('glib-compile-resources', glib_compile_resources) meson.override_find_program('glib-compile-resources', glib_compile_resources)
meson.override_find_program('gio-querymodules', gio_querymodules) meson.override_find_program('gio-querymodules', gio_querymodules)