From c077b74ee8187042ad3ad8001d94074e73e3e9ea Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 28 Jun 2018 14:34:18 +0100 Subject: [PATCH] meson: use dependency()+find_program() for wayland-scanner Helps when the native wayland-scanner is located outside of PATH. Inspired by the xserver code ;-) Signed-off-by: Emil Velikov Reviewed-by: Dylan Baker Reviewed-by: Eric Engestrom --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index cbaee5ceb22..a155905312d 100644 --- a/meson.build +++ b/meson.build @@ -1275,7 +1275,8 @@ endif # TODO: symbol mangling if with_platform_wayland - prog_wl_scanner = find_program('wayland-scanner') + dep_wl_scanner = dependency('wayland-scanner', native: true) + prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8') dep_wayland_client = dependency('wayland-client', version : '>=1.11') dep_wayland_server = dependency('wayland-server', version : '>=1.11') -- 2.30.2