From ad041d6dabd6c31efea896c3ff2248d0088d7dfa Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Sun, 20 Jul 2025 20:02:47 +0800 Subject: [PATCH] [CI] (3rdparty): attempting to install glslang --- .github/workflows/test.yml | 17 ++++++++++++++++- MobileGL/MG_Test/Program/CMakeLists.txt | 8 ++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 93b10124..8176aa64 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,22 @@ jobs: with: submodules: true - - uses: lukka/get-cmake@latest + - name: Get CMake + uses: lukka/get-cmake@latest + + - name: Prepare Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.1 + with: + vulkan-query-version: 1.4.304.1 + vulkan-components: Glslang, SPIRV-Cross, SPIRV-Tools, SPIRV-Reflect, SPIRV-Headers + vulkan-use-cache: true + + - name: Test Vulkan SDK Install + run: | + echo "Vulkan SDK Version=='$VULKAN_SDK_VERSION'" + echo "VULKAN_SDK=='$VULKAN_SDK'" + test -n "$VULKAN_SDK_VERSION" || exit 4 + ls $VULKAN_SDK/lib - name: Configure CMake working-directory: ${{env.TEST_ROOT}} diff --git a/MobileGL/MG_Test/Program/CMakeLists.txt b/MobileGL/MG_Test/Program/CMakeLists.txt index a703e5bb..4a18b3e4 100644 --- a/MobileGL/MG_Test/Program/CMakeLists.txt +++ b/MobileGL/MG_Test/Program/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.24) -set(glslang_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/glslang) -set(SPIRV-Tools_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/SPIRV-Tools) -set(SPIRV-Tools-opt_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/SPIRV-Tools-opt) +#set(glslang_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/glslang) +#set(SPIRV-Tools_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/SPIRV-Tools) +#set(SPIRV-Tools-opt_DIR /Users/swung0x48/VulkanSDK/1.4.321.0/macOS/lib/cmake/SPIRV-Tools-opt) #find_package(SPIRV-Tools CONFIG REQUIRED) #find_package(SPIRV-Tools-opt CONFIG REQUIRED) -find_package(glslang CONFIG) +find_package(glslang CONFIG REQUIRED) add_executable( ProgramTest