From: Benjamin Otte <otte@redhat.com>
Date: Wed, 19 Jul 2023 13:36:55 +0000 (+0200)
Subject: build: Move the glslc check into the top meson file
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~58^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=92038d6b7f80c9ef480773ccebabc4909772ab9b;p=gtk4.git

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 cc17b6303f..146120d8fb 100644
--- 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 6d5ef1c434..ee75e706c7 100644
--- 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'