Merge branch 'gio-windows' into 'main'

Meson: Fix gio-windows-2.0 override name

See merge request GNOME/glib!2615
This commit is contained in:
Philip Withnall 2022-04-25 10:30:11 +00:00
commit cc99d6ee97

View File

@ -877,7 +877,7 @@ if host_system == 'windows'
description : 'Windows specific headers for glib I/O library', description : 'Windows specific headers for glib I/O library',
) )
if meson.version().version_compare('>=0.54.0') if meson.version().version_compare('>=0.54.0')
meson.override_dependency('gio-win32-2.0', libgio_dep) meson.override_dependency('gio-windows-2.0', libgio_dep)
endif endif
else else
pkg.generate(requires : ['gobject-2.0', 'gio-2.0'], pkg.generate(requires : ['gobject-2.0', 'gio-2.0'],