Merge branch 'fix-wayland-subproject-build' into 'main'

Fix build with wayland-protocols subproject

Closes #4530

See merge request GNOME/gtk!4465
This commit is contained in:
Matthias Clasen 2022-02-10 19:13:33 +00:00
commit ff4b5c8996

View File

@ -71,7 +71,7 @@ foreach p: proto_sources
elif proto_stability == 'staging' elif proto_stability == 'staging'
proto_version = p.get(2) proto_version = p.get(2)
output_base = '@0@-@1@'.format(proto_name, proto_version) output_base = '@0@-@1@'.format(proto_name, proto_version)
input = join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)) input = files(join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)))
elif proto_stability == 'private' elif proto_stability == 'private'
output_base = proto_name output_base = proto_name
input = files('protocol/@0@.xml'.format(proto_name)) input = files('protocol/@0@.xml'.format(proto_name))