From fda45a1bfea08b856e32dcecc40c322fa294797b Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 6 Oct 2026 21:20:13 +0200 Subject: [PATCH] Tweaked the action and the cmake --- .gitea/workflows/build_linux.yaml | 21 ++++++++++++--------- CMakeLists.txt | 11 ----------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/build_linux.yaml b/.gitea/workflows/build_linux.yaml index 82f0d7d..e080225 100644 --- a/.gitea/workflows/build_linux.yaml +++ b/.gitea/workflows/build_linux.yaml @@ -22,22 +22,17 @@ jobs: sudo apt install -y \ cmake \ ninja-build \ - curl \ + pkg-config \ + g++ \ libvulkan1 \ - vulkan-validationlayers \ - vulkan-tools \ - libvulkan-memory-allocator-dev \ - libvulkan-volk-dev \ glslang-tools \ libglfw3-dev \ - libfmt-dev \ libcli11-dev \ libglm-dev \ + libpulse-dev \ libwayland-dev \ wayland-protocols \ - libwayland-bin \ - libxkbcommon-dev \ - libpulse-dev + libxkbcommon-dev - name: Install Slang run: | @@ -55,6 +50,14 @@ jobs: ls -la /usr/local/bin/slangc + - name: Install Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.1 + with: + vulkan-query-version: 1.4.335.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true + + - name: Check dependencies run: | cmake --version diff --git a/CMakeLists.txt b/CMakeLists.txt index 544e09b..0fd345e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,13 +29,6 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(fastgltf) -FetchContent_Declare( - Vulkan-Headers - GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git - GIT_TAG vulkan-sdk-1.4.335 -) -FetchContent_MakeAvailable(Vulkan-Headers) - FetchContent_Declare( Vulkan-Utility-Libraries GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git @@ -43,10 +36,6 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(Vulkan-Utility-Libraries) -set(VK_BOOTSTRAP_VULKAN_HEADER_DIR - "${vulkan-headers_SOURCE_DIR}/include" - CACHE PATH "" FORCE -) FetchContent_Declare( vk_bootstrap