CMAKE: Use glslang from Vulkan library.

vectorgraphics · Apr 13, 2024 · bc86ccb · bc86ccb
1 parent eeb7227
commit bc86ccb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/cmake-scripts/external-libs.cmake b/cmake-scripts/external-libs.cmake
@@ -233,9 +233,9 @@ that warning can be safely ignored. We are not using glslang from the vulkan pac
 We are using a separate glslang package
     ")
 
-    include(FindVulkan)
-    if (Vulkan_FOUND)
-        list(APPEND ASY_STATIC_LIBARIES Vulkan::Vulkan)
+    find_package(Vulkan COMPONENTS glslang)
+    if (Vulkan_FOUND AND Vulkan_glslang_FOUND)
+        list(APPEND ASY_STATIC_LIBARIES Vulkan::Vulkan Vulkan::glslang)
     else()
         message(FATAL_ERROR "Vulkan not found")
     endif()
@@ -247,13 +247,6 @@ We are using a separate glslang package
         message(FATAL_ERROR "glfw3 not found")
     endif()
 
-    find_package(glslang CONFIG)
-    if (glslang_FOUND)
-        list(APPEND ASY_STATIC_LIBARIES glslang::SPIRV)
-    else()
-        message(FATAL_ERROR "glslang not found")
-    endif()
-
     list(APPEND ASY_MACROS HAVE_VULKAN)
 
     if (ENABLE_VK_VALIDATION_LAYERS)

diff --git a/vcpkg.json b/vcpkg.json
@@ -55,7 +55,6 @@
       "description": "Vulkan Support",
       "dependencies": [
         "vulkan",
-        "glslang",
         "glfw3"
       ]
     },