vulkan/wsi: fix build when platform headers are installed in non-standard locations

Anything that uses the platform defines in `vulkan_wsi_list` will need
to be able to resole the includes they trigger, which are provided by
`vulkan_wsi_deps`.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10304
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26715>
(cherry picked from commit 8043e8c4a66673675b2e1018f214e471942c717d)

diff --git a/.pick_status.json b/.pick_status.json
index f81141b..07735c5 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -304,7 +304,7 @@
         "description": "vulkan/wsi: fix build when platform headers are installed in non-standard locations",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null

diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
index 4202d70..a94ed1a 100644 (file)
--- a/src/vulkan/meson.build
+++ b/src/vulkan/meson.build
@@ -92,6 +92,7 @@ endif
 
 idep_vulkan_wsi_defines = declare_dependency(
   compile_args : vulkan_wsi_list,
+  dependencies : vulkan_wsi_deps,
 )
 vulkan_wsi_deps += idep_vulkan_wsi_defines