Skip to content

Commit 0c6e0f1

Browse files
compile vulkan dependent with version
1 parent f026871 commit 0c6e0f1

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

dependencies.cmake

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,26 @@ FetchContent_Declare(
7878
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
7979
GIT_TAG vulkan-sdk-1.3.290.0
8080
GIT_SHALLOW TRUE
81-
FIND_PACKAGE_ARGS CONFIG
8281
)
8382

8483
FetchContent_Declare(
8584
VulkanMemoryAllocator
8685
GIT_REPOSITORY https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
8786
GIT_SHALLOW TRUE
8887
GIT_TAG v3.3.0
89-
FIND_PACKAGE_ARGS CONFIG
9088
)
9189

9290
FetchContent_Declare(
9391
SPIRV-Headers
9492
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
9593
GIT_SHALLOW TRUE
9694
GIT_TAG vulkan-sdk-1.3.290.0
97-
FIND_PACKAGE_ARGS CONFIG
9895
)
9996

10097
FetchContent_Declare(
10198
glslang
10299
GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
103100
GIT_SHALLOW TRUE
104-
GIT_TAG vulkan-sdk-1.3.290.0
105101
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
106102
FIND_PACKAGE_ARGS CONFIG
107103
)
@@ -112,7 +108,6 @@ FetchContent_Declare(
112108
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
113109
GIT_SHALLOW TRUE
114110
GIT_TAG vulkan-sdk-1.3.290.0
115-
FIND_PACKAGE_ARGS CONFIG
116111
)
117112

118113

@@ -142,6 +137,7 @@ Fetchcontent_Declare(
142137
CLI11
143138
GIT_REPOSITORY https://github.com/CLIUtils/CLI11
144139
GIT_SHALLOW TRUE
140+
GIT_TAG main
145141
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
146142
FIND_PACKAGE_ARGS CONFIG
147143
)
@@ -159,14 +155,12 @@ FetchContent_Declare(Vulkan-Headers
159155
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
160156
GIT_SHALLOW TRUE
161157
GIT_TAG vulkan-sdk-1.3.290.0
162-
FIND_PACKAGE_ARGS CONFIG NAMES VulkanHeaders
163158
)
164159

165160
FetchContent_Declare(Vulkan-Loader
166161
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
167162
GIT_SHALLOW TRUE
168-
GIT_TAG sdk-0.1.0-3544-g40b8e6eee
169-
FIND_PACKAGE_ARGS CONFIG NAMES VulkanLoader
163+
GIT_TAG vulkan-sdk-1.3.290.0
170164
)
171165

172166

vcpkg.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@
2727
"overrides": [
2828
{
2929
"name": "spirv-cross",
30-
"version": "vulkan-sdk-1.3.290.0"
30+
"version": "1.3.290.0"
3131
},
3232
{
3333
"name": "vulkan-memory-allocator",
34-
"version": "v3.3.0"
34+
"version": "3.3.0"
3535
},
3636
{
3737
"name": "spirv-headers",
38-
"version": "vulkan-sdk-1.3.290.0"
38+
"version": "1.3.290.0"
3939
},
4040
{
4141
"name": "glslang",
42-
"version": "vulkan-sdk-1.3.290.0"
42+
"version": "1.3.290.0"
4343
},
4444
{
4545
"name": "spirv-tools",
46-
"version": "vulkan-sdk-1.3.290.0"
46+
"version": "1.3.290.0"
4747
},
4848
{
4949
"name": "vulkan-headers",
50-
"version": "vulkan-sdk-1.3.290.0"
50+
"version": "1.3.290.0"
5151
},
5252
{
5353
"name": "vulkan-loader",
54-
"version": "vulkan-sdk-1.3.290.0"
54+
"version": "1.3.290.0"
5555
}
5656
],
5757
"builtin-baseline": "0d9d4684352ba8de70bdf251c6fc9a3c464fa12b"

0 commit comments

Comments
 (0)