From ddd7ee7a0d476dfbf66bd9051a24bde7ec0fe36c Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 6 Oct 2026 14:58:38 +0200 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c3b01a..f879892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,28 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_AR "${GCC_AR}") set(CMAKE_RANLIB "${GCC_RANLIB}") endif() +# Fetch required things +# fastgltf because it's not in nixpkgs + +FetchContent_Declare( + fastgltf + GIT_REPOSITORY https://github.com/spnda/fastgltf.git + GIT_TAG v0.8.0 +) +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) # Find all package dependencies find_package( glfw3 REQUIRED ) find_package( glm REQUIRED ) find_package( VulkanMemoryAllocator CONFIG REQUIRED ) -find_package( vk-bootstrap REQUIRED ) +#find_package( vk-bootstrap REQUIRED ) find_package( fmt REQUIRED ) find_package( CLI11 REQUIRED ) # Shader compilers @@ -43,21 +59,6 @@ set_property ( find_program(SLANGC_EXECUTABLE slangc HINTS $ENV{VULKAN_SDK}/bin REQUIRED) -# fastgltf because it's not in nixpkgs - -FetchContent_Declare( - fastgltf - GIT_REPOSITORY https://github.com/spnda/fastgltf.git - GIT_TAG v0.8.0 -) -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)