Skip to content

Commit

Permalink
Apply patch only if USE_VCPKG enabled.
Browse files Browse the repository at this point in the history
  • Loading branch information
stripe2933 committed Jul 21, 2024
1 parent cedaef6 commit 565226b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
$<$<BOOL:${USE_VCPKG}>:PATCHES ${CMAKE_CURRENT_BINARY_DIR}/_deps/vku-src/vcpkg-deps.patch> # Apply patch if USE_VCPKG enabled.
OPTIONS "VKU_USE_STD_MODULE ON"
)

Expand Down
3 changes: 2 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 565226b

Please sign in to comment.