Alexandre_1a/Vulkan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CMakeLists.txt
Some checks failed
Build VulkanEngine / nix (push) Successful in 3m33s
Details
Build VulkanEngine / release (BUNDLE) (push) Failing after 2m22s
Details
Build VulkanEngine / release (PORTABLE) (push) Failing after 2m20s
Details
Build VulkanEngine / notify (push) Successful in 5s
Details

Browse Source
This commit is contained in:
Alexandre 2026-10-09 21:30:30 +02:00
parent 697d604d5a
commit 0313543c06
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -120,6 +120,13 @@ if(VULKANENGINE_FETCH_DEPS)
FetchContent_Declare(VulkanHeaders FetchContent_Declare(VulkanHeaders
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git
GIT_TAG v1.4.309) GIT_TAG v1.4.309)
# vulkan/vk_enum_string_helper.h lives here, not in Vulkan-Headers.
# SOURCE_SUBDIR points to a nonexistent dir so MakeAvailable only downloads
# (we use the checked-in header, no need to run its CMake).
FetchContent_Declare(VulkanUtilityLibraries
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
GIT_TAG v1.4.309
SOURCE_SUBDIR _no_cmake)
FetchContent_Declare(volk FetchContent_Declare(volk
GIT_REPOSITORY https://github.com/zeux/volk.git GIT_REPOSITORY https://github.com/zeux/volk.git
GIT_TAG 1.4.304) GIT_TAG 1.4.304)
@ -131,7 +138,7 @@ if(VULKANENGINE_FETCH_DEPS)
GIT_TAG 3.4) GIT_TAG 3.4)
FetchContent_Declare(vk-bootstrap FetchContent_Declare(vk-bootstrap
GIT_REPOSITORY https://github.com/charles-lunarg/vk-bootstrap.git GIT_REPOSITORY https://github.com/charles-lunarg/vk-bootstrap.git
GIT_TAG v1.4.365) GIT_TAG v1.4.309)
FetchContent_Declare(fmt FetchContent_Declare(fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 11.0.2) GIT_TAG 11.0.2)
@ -146,11 +153,16 @@ if(VULKANENGINE_FETCH_DEPS)
GIT_TAG v3.10.1) GIT_TAG v3.10.1)
# Vulkan headers first: vk-bootstrap and volk pick up Vulkan::Headers # Vulkan headers first: vk-bootstrap and volk pick up Vulkan::Headers
FetchContent_MakeAvailable(VulkanHeaders) FetchContent_MakeAvailable(VulkanHeaders VulkanUtilityLibraries)
FetchContent_MakeAvailable(volk VMA glfw vk-bootstrap fmt CLI11 glm simdjson) FetchContent_MakeAvailable(volk VMA glfw vk-bootstrap fmt CLI11 glm simdjson)
target_link_libraries(volk PUBLIC Vulkan::Headers) target_link_libraries(volk PUBLIC Vulkan::Headers)
add_library(vk_utility_headers INTERFACE)
target_include_directories(vk_utility_headers SYSTEM INTERFACE
${vulkanutilitylibraries_SOURCE_DIR}/include)
target_link_libraries(vk_utility_headers INTERFACE Vulkan::Headers)
else() else()
# Nix path # Nix path
find_package( volk CONFIG REQUIRED ) find_package( volk CONFIG REQUIRED )
@ -404,6 +416,7 @@ if(VULKANENGINE_FETCH_DEPS)
list(APPEND lib_list list(APPEND lib_list
volk volk
Vulkan::Headers Vulkan::Headers
vk_utility_headers
GPUOpen::VulkanMemoryAllocator GPUOpen::VulkanMemoryAllocator
glm::glm-header-only glm::glm-header-only
simdjson::simdjson simdjson::simdjson