diff --git a/.gitea/workflows/build_linux.yaml b/.gitea/workflows/build_linux.yaml index bf2855a..4aacdde 100644 --- a/.gitea/workflows/build_linux.yaml +++ b/.gitea/workflows/build_linux.yaml @@ -22,14 +22,9 @@ jobs: sudo apt install -y \ cmake \ ninja-build \ - pkg-config \ - g++ \ - git \ curl \ - tar \ \ libvulkan-dev \ - libvulkan1 \ vulkan-validationlayers \ vulkan-tools \ vulkan-utility-libraries-dev \ @@ -49,24 +44,6 @@ jobs: libxkbcommon-dev \ libpulse-dev - - name: Install vk-bootstrap - run: | - git clone --depth 1 https://github.com/charles-lunarg/vk-bootstrap.git /tmp/vk-bootstrap - - cmake \ - -S /tmp/vk-bootstrap \ - -B /tmp/vk-bootstrap/build \ - -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DVK_BOOTSTRAP_TEST=OFF \ - -DVK_BOOTSTRAP_INSTALL=ON - - cmake \ - --build /tmp/vk-bootstrap/build - - sudo cmake \ - --install /tmp/vk-bootstrap/build - - name: Install Slang run: | SLANG_VERSION="2026.19" @@ -138,4 +115,4 @@ jobs: curl \ -H "Title: [Routine] VulkanEngine build" \ -d "Build finished (status: ${{ job.status }})" \ - https://ntfy.alexdelcamp.fr/FlakeBuild \ No newline at end of file + https://ntfy.alexdelcamp.fr/FlakeBuild diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af70aa..2c3b01a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,13 @@ FetchContent_Declare( ) FetchContent_MakeAvailable(fastgltf) +FetchContent_Declare( + fetch_vk_bootstrap + GIT_REPOSITORY https://github.com/charles-lunarg/vk-bootstrap + GIT_TAG v1.4.364 +) +FetchContent_MakeAvailable(fetch_vk_bootstrap) + # Helper functions to build shaders function(addGlslShader SOURCE OUTPUT_DIR) get_filename_component(SHADER_NAME ${SOURCE} NAME_WE) @@ -221,7 +228,7 @@ list( # Libs used glfw fmt::fmt - vk-bootstrap + vk-bootstrap::vk-bootstrap vulkan CLI11::CLI11 fastgltf