Mesa (staging/18.3): meson: only run vulkan's meson.build when building vulkan

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Oct 11 16:21:14 2018 +0100

meson: only run vulkan's meson.build when building vulkan

Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 3832db275efdb235b3b7b27c9b41e64d5507aa2c)

---

 src/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/meson.build b/src/meson.build
index 73146d3714..2c0bff7343 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -52,7 +52,9 @@ subdir('mapi')
 # TODO: opengl
 subdir('compiler')
 subdir('egl/wayland/wayland-drm')
-subdir('vulkan')
+if with_any_vk
+  subdir('vulkan')
+endif
 if with_gallium_radeonsi or with_amd_vk
   subdir('amd')
 endif