[Mesa-dev] [PATCH 1/3] meson: use dependency()+find_program() for wayland-scanner

[Emil Velikov]

On 6 August 2018 at 17:39, Dylan Baker <dylan at pnwbakers.com> wrote:
> Quoting Emil Velikov (2018-06-28 07:35:44)
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> Helps when the native wayland-scanner is located outside of PATH.
>> Inspired by the xserver code ;-)
>>
>> Cc: Dylan Baker <dylan at pnwbakers.com>
>> Cc: Eric Engestrom <eric at engestrom.ch>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  meson.build | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meson.build b/meson.build
>> index b2722c71e5b..79bac89e7d9 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -1269,7 +1269,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.18.0
>>
>
> Hey Emil, it doesn't look like this ever landed, is there a reason for that I'm
> not seeing in the mailing list discussion?
>
Nothing special - simply forgot.
Will double-check it doesn't break anything and will push in a moment.

-Emil