Mesa (18.3): vulkan/util: meson build - add wayland client include

[GitLab Mirror]

Module: Mesa
Branch: 18.3
Commit: 8e909034639207e5dee8abb03e1537d4680398da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e909034639207e5dee8abb03e1537d4680398da

Author: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Date:   Sat Mar 16 19:56:59 2019 +0100

vulkan/util: meson build - add wayland client include

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>
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 29179f58c6ba8099859ea25900214dbbd3814a92)
[Emil: resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

Conflicts:
	src/vulkan/util/meson.build

---

 src/vulkan/util/meson.build | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index 15e4ff49129..241fa448526 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, inc_vulkan],
+  dependencies : vulkan_util_deps,
   c_args : [c_vis_args],
   build_by_default : false,
 )