[Mesa-dev] [PATCH] vulkan/util: meson build - add wayland client include

[Eric Engestrom]

On Saturday, 2019-03-16 20:32:46 +0000, Lionel Landwerlin wrote:
> There is merge request opened about this issue :
> https://gitlab.freedesktop.org/mesa/mesa/merge_requests/429
> 
> I think the deps need to be moved from src/vulkan/wsi/meson.build into
> src/vulkan/meson.build as they apply to the overlay, utils & wsi.

Since it's correct though, I landed Tobias' patch with my r-b and
Cc: stable (I dropped the unnecessary [] though), and I sent MR !460
with your suggestion.

> 
> Thanks,
> 
> -Lionel
> 
> On 16/03/2019 18:56, Tobias Klausmann wrote:
> > Without this the build breaks with:
> > 
> > In file included from ../src/vulkan/util/vk_util.h:32,
> >                   from ../src/vulkan/util/vk_util.c:28:
> > ../include/vulkan/vulkan.h:51:10: fatal error: wayland-client.h: No such file or
> > directory
> >   #include <wayland-client.h>
> >            ^~~~~~~~~~~~~~~~~~
> > compilation terminated.
> > 
> > The above misses the include directory for wayland:
> >     -I/usr/include/wayland
> > 
> > Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
> > ---
> >   src/vulkan/util/meson.build | 9 ++++++++-
> >   1 file changed, 8 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
> > index 6aba265cc81..b845f57a660 100644
> > --- a/src/vulkan/util/meson.build
> > +++ b/src/vulkan/util/meson.build
> > @@ -36,10 +36,17 @@ vk_enum_to_str = custom_target(
> >     ],
> >   )
> > +vulkan_util_deps = []
> > +
> > +if with_platform_wayland
> > +  vulkan_util_deps += dep_wayland_client
> > +endif
> > +
> >   libvulkan_util = static_library(
> >     'vulkan_util',
> >     [files_vulkan_util, vk_enum_to_str],
> > -  include_directories : inc_common,
> > +  include_directories : [inc_common],
> > +  dependencies : [vulkan_util_deps],
> >     c_args : [c_vis_args, vulkan_wsi_args],
> >     build_by_default : false,
> >   )