diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-04-11 10:34:20 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-04-13 21:40:59 +0300 |
| commit | c649a2b8c59c9f49affca9bd89c126bfa0f54449 (patch) | |
| tree | 666b0bcebd697c5b393a0cd8bf48188389802020 | |
| parent | 2fcd3a417489ca456b57f87c9921f68d5872bb3a (diff) | |
| download | meson-c649a2b8c59c9f49affca9bd89c126bfa0f54449.zip meson-c649a2b8c59c9f49affca9bd89c126bfa0f54449.tar.gz meson-c649a2b8c59c9f49affca9bd89c126bfa0f54449.tar.bz2 | |
wayland: Make sure wayland-scanner has same version as wayland libraries
| -rw-r--r-- | mesonbuild/modules/unstable_wayland.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/modules/unstable_wayland.py b/mesonbuild/modules/unstable_wayland.py index c3e29f4..79f7685 100644 --- a/mesonbuild/modules/unstable_wayland.py +++ b/mesonbuild/modules/unstable_wayland.py @@ -45,7 +45,12 @@ class WaylandModule(ExtensionModule): ) def scan_xml(self, state, args, kwargs): if self.scanner_bin is None: - self.scanner_bin = state.find_program('wayland-scanner', for_machine=MachineChoice.BUILD) + # wayland-scanner from BUILD machine must have same version as wayland + # libraries from HOST machine. + dep = self.interpreter.func_dependency(state.current_node, ['wayland-client'], {}) + self.scanner_bin = state.find_program('wayland-scanner', + for_machine=MachineChoice.BUILD, + wanted=dep.version) scope = 'public' if kwargs['public'] else 'private' sides = [i for i in ['client', 'server'] if kwargs[i]] |