vulkan/util: meson build - add wayland client include
authorTobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Sat, 16 Mar 2019 18:56:59 +0000 (19:56 +0100)
committerEric Engestrom <eric.engestrom@intel.com>
Sun, 17 Mar 2019 17:55:29 +0000 (17:55 +0000)
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@mni.thm.de>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
src/vulkan/util/meson.build

index 6aba265cc8106bfe25f2fc704f9bd8f6a2094e2d..7679b2bdda8a6a610adf26575ab60bf7ba9f8650 100644 (file)
@@ -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,
+  dependencies : vulkan_util_deps,
   c_args : [c_vis_args, vulkan_wsi_args],
   build_by_default : false,
 )