build: Move the glslc check into the top meson file

Put it with the other Vulkan checks, so it's easy to find.

diff --git a/gsk/vulkan/resources/meson.build b/gsk/vulkan/resources/meson.build
index cc17b6303f4031f0bbd8aa9f2e32e5fee1e6ec57..146120d8fbe46e6e49cfafcc8b788d5ac869e439 100644 (file)
--- a/gsk/vulkan/resources/meson.build
+++ b/gsk/vulkan/resources/meson.build
@@ -44,7 +44,6 @@ gsk_private_vulkan_vertex_shaders = [
 gsk_private_vulkan_shaders += gsk_private_vulkan_fragment_shaders
 gsk_private_vulkan_shaders += gsk_private_vulkan_vertex_shaders
 
-glslc = find_program('glslc', required: true)
 foreach shader: gsk_private_vulkan_shaders
   basefn = shader.split('.').get(0)
   suffix = shader.split('.').get(1)

diff --git a/meson.build b/meson.build
index 6d5ef1c43431bcf26d05ceaf1037251d1226a670..ee75e706c7ffe64613183bbc1c61cd03fd0bd84c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -599,6 +599,7 @@ endif
 # to use a custom path for the Vulkan SDK. Bugs that are found with it should
 # be reported upstream and fixed.
 vulkan_dep = dependency('vulkan', required: get_option('vulkan'))
+glslc = find_program('glslc', required: get_option('vulkan'))
 if vulkan_dep.found()
   have_vulkan = true
   vulkan_pkg_found = vulkan_dep.type_name() == 'pkgconfig'