[cmake] Attempt to fix CI

inexorgame · Jul 14, 2024 · d67dd42 · d67dd42
1 parent cd02a1a
commit d67dd42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -87,6 +87,6 @@ FetchContent_Declare(volk
 
 FetchContent_Declare(Vulkan
     GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
-    GIT_TAG v1.3.270
+    GIT_TAG v1.3.290
     GIT_PROGRESS ON
-    FIND_PACKAGE_ARGS 1.3.270)
+    FIND_PACKAGE_ARGS 1.3.290)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -117,9 +117,10 @@ target_include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/include/
 )
 
-# Vulkan SDK must be installed first
 FetchContent_MakeAvailable(Vulkan)
 
+find_package(Vulkan REQUIRED)
+
 # Declare use of dependencies
 FetchContent_MakeAvailable(fmt)
 FetchContent_MakeAvailable(glfw)
@@ -138,9 +139,6 @@ FetchContent_MakeAvailable(toml)
 FetchContent_MakeAvailable(vma)
 FetchContent_MakeAvailable(volk)
 
-# Work around a VMA compile error from its use of snprintf
-target_compile_definitions(VulkanMemoryAllocator PRIVATE VMA_STATS_STRING_ENABLED=0)
-
 if (WIN32)
    set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_WIN32_KHR)
 endif()