From 565226b1736eceb8368b8ccb0e92cbf527277b6a Mon Sep 17 00:00:00 2001 From: gomkyung2 Date: Sun, 21 Jul 2024 18:52:25 +0900 Subject: [PATCH] Apply patch only if USE_VCPKG enabled. --- CMakeLists.txt | 2 +- CMakePresets.json | 3 ++- README.md | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fadaac8..377a8b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CPMAddPackage( NAME vku GITHUB_REPOSITORY stripe2933/vku GIT_TAG module - PATCHES ${CMAKE_CURRENT_BINARY_DIR}/_deps/vku-src/vcpkg-deps.patch + $<$:PATCHES ${CMAKE_CURRENT_BINARY_DIR}/_deps/vku-src/vcpkg-deps.patch> # Apply patch if USE_VCPKG enabled. OPTIONS "VKU_USE_STD_MODULE ON" ) diff --git a/CMakePresets.json b/CMakePresets.json index 6f34e84..b18f3f1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,7 +13,8 @@ "inherits": "default", "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", - "VCPKG_OVERLAY_PORTS": "${sourceDir}/overlays" + "VCPKG_OVERLAY_PORTS": "${sourceDir}/overlays", + "USE_VCPKG": "ON" } } ] diff --git a/README.md b/README.md index fdfb262..ad53ca5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # vk-deferred +![Linux](https://github.com/stripe2933/vk-deferred/actions/workflows/linux.yml/badge.svg) +![Windows](https://github.com/stripe2933/vk-deferred/actions/workflows/windows.yml/badge.svg) + ![Running screenshot](doc/images/running-screenshot.png) A minimal Vulkan deferred rendering demonstration. @@ -8,7 +11,7 @@ A minimal Vulkan deferred rendering demonstration. This project requires support for C++20 modules and the C++23 standard library. The supported compiler is: - Clang 18.1.2 -- ~~MSVC 19.40 (Older versions may fail to compile due to various MSVC module bugs)~~ (currently being tested) +- ~~MSVC 19.40 (Older versions may fail to compile due to various MSVC module bugs)~~ (currently not working with internal compiler error: I'll investigate it!) Additionally, the following build tools are required: - CMake 3.30 @@ -19,9 +22,9 @@ Additionally, the following build tools are required: This project depends on: - [GLFW](https://github.com/glfw/glfw) - [glm](https://github.com/g-truc/glm) -- [Vulkan-Hpp](https://github.com/KhronosGroup/Vulkan-Hpp) -- [VulkanMemoryAllocator-Hpp](https://github.com/YaaZ/VulkanMemoryAllocator-Hpp) -- My own Vulkan-Hpp helper library, [vku](https://github.com/stripe2933/vku/tree/module) (branch `module`) +- My own Vulkan-Hpp helper library, [vku](https://github.com/stripe2933/vku/tree/module) (branch `module`), which has the following dependencies: + - [Vulkan-Hpp](https://github.com/KhronosGroup/Vulkan-Hpp) + - [VulkanMemoryAllocator-Hpp](https://github.com/YaaZ/VulkanMemoryAllocator-Hpp) ### Build Steps