Skip to content

Commit 1081ec1

Browse files
MathewBensonCodeMathewBensonCode
committed
Use fetchcontent and/or vcpkg with version
1 parent cc15361 commit 1081ec1

5 files changed

Lines changed: 65 additions & 28 deletions

File tree

‎.github/workflows/Engine-CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: [ master, develop, arena-integration, vcpkg_binary_cache ]
3+
branches: [ master, develop, arena-integration, fetchcontent_versioned_dependencies ]
44
pull_request:
55
branches: [ master, develop, arena-integration ]
66

‎Tetragrama/Helpers/UIComponentDrawerHelper.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Tetragrama::Helpers
1313
ImGui::Columns(2);
1414

1515
ImGui::SetColumnWidth(0, column_width);
16-
ImGui::Text(label.data());
16+
ImGui::Text("%s", label.data());
1717
ImGui::NextColumn();
1818

1919
ImGui::PushMultiItemsWidths(4, ImGui::CalcItemWidth());
@@ -140,7 +140,7 @@ namespace Tetragrama::Helpers
140140
ImGui::Columns(2);
141141

142142
ImGui::SetColumnWidth(0, column_width);
143-
ImGui::Text(label.data());
143+
ImGui::Text("%s", label.data());
144144
ImGui::NextColumn();
145145

146146
ImGui::PushMultiItemsWidths(5, ImGui::CalcItemWidth());
@@ -243,7 +243,7 @@ namespace Tetragrama::Helpers
243243
ImGui::Columns(2);
244244

245245
ImGui::SetColumnWidth(0, column_width);
246-
ImGui::Text(label.data());
246+
ImGui::Text("%s", label.data());
247247
ImGui::NextColumn();
248248

249249
ImGui::PushMultiItemsWidths(2, ImGui::CalcItemWidth());
@@ -314,7 +314,7 @@ namespace Tetragrama::Helpers
314314
ImGui::Columns(2);
315315

316316
ImGui::SetColumnWidth(0, column_width);
317-
ImGui::Text(label.data());
317+
ImGui::Text("%s", label.data());
318318
ImGui::NextColumn();
319319

320320
ImGui::PushMultiItemsWidths(1, ImGui::CalcItemWidth() + 60.f);
@@ -349,7 +349,7 @@ namespace Tetragrama::Helpers
349349
ImGui::Columns(2);
350350

351351
ImGui::SetColumnWidth(0, column_width);
352-
ImGui::Text(label.data());
352+
ImGui::Text("%s", label.data());
353353
ImGui::NextColumn();
354354

355355
ImGui::PushMultiItemsWidths(1, ImGui::CalcItemWidth() + 60.f);
@@ -402,7 +402,7 @@ namespace Tetragrama::Helpers
402402
ImGui::Columns(2);
403403

404404
ImGui::SetColumnWidth(0, column_width);
405-
ImGui::Text(label.data());
405+
ImGui::Text("%s", label.data());
406406
ImGui::NextColumn();
407407

408408
ImGui::PushMultiItemsWidths(1, ImGui::CalcItemWidth() + 60.f);
@@ -429,7 +429,7 @@ namespace Tetragrama::Helpers
429429
ImGui::Columns(2);
430430

431431
ImGui::SetColumnWidth(0, column_width);
432-
ImGui::Text(label.data());
432+
ImGui::Text("%s", label.data());
433433
ImGui::NextColumn();
434434

435435
ImGui::PushMultiItemsWidths(1, ImGui::CalcItemWidth() + 60.f);
@@ -455,7 +455,7 @@ namespace Tetragrama::Helpers
455455
ImGui::Columns(2);
456456

457457
ImGui::SetColumnWidth(0, column_width);
458-
ImGui::Text(label.data());
458+
ImGui::Text("%s", label.data());
459459
ImGui::NextColumn();
460460

461461
ImGui::PushMultiItemsWidths(1, ImGui::CalcItemWidth() + 60.f);

‎ZEngine/ZEngine/Windows/Inputs/KeyCode.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
2-
#include <fmt/format.h>
32
#include <cstdint>
3+
#include <iostream>
44

55
namespace ZEngine::Windows::Inputs
66
{
@@ -138,8 +138,9 @@ namespace ZEngine::Windows::Inputs
138138

139139
} GlfwKey;
140140

141-
inline auto format_as(GlfwKey f)
141+
inline std::ostream& operator<<(std::ostream& stream, GlfwKeyCode f)
142142
{
143-
return fmt::underlying(f);
143+
stream << static_cast<int32_t>(f);
144+
return stream;
144145
}
145146
} // namespace ZEngine::Windows::Inputs

‎dependencies.cmake‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FetchContent_Declare(
44
fmt
55
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
66
GIT_SHALLOW TRUE
7+
GIT_TAG 8.0.1-8-ge41ac1f8
78
FIND_PACKAGE_ARGS CONFIG
89
)
910

@@ -19,21 +20,23 @@ FetchContent_Declare(
1920
imguizmo
2021
GIT_REPOSITORY https://github.com/CedricGuillemet/ImGuizmo.git
2122
GIT_SHALLOW TRUE
22-
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/ImGuizmo"
2323
GIT_TAG 1.83
24+
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/ImGuizmo"
2425
)
2526

2627
FetchContent_Declare(
27-
stbimage
28+
stb
2829
GIT_REPOSITORY https://github.com/nothings/stb.git
29-
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/stb
3030
GIT_SHALLOW TRUE
31+
GIT_TAG 8e51be04dc7dcee462e1f09e410faceab52cc6d2
32+
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/stb
3133
)
3234

3335
FetchContent_Declare(
3436
glfw3
3537
GIT_REPOSITORY https://github.com/glfw/glfw.git
3638
GIT_SHALLOW TRUE
39+
GIT_TAG 3.3-491-gfb0f2f92
3740
FIND_PACKAGE_ARGS CONFIG
3841
)
3942

@@ -49,6 +52,7 @@ FetchContent_Declare(
4952
EnTT
5053
GIT_REPOSITORY https://github.com/skypjack/entt.git
5154
GIT_SHALLOW TRUE
55+
GIT_TAG v3.13.0-341-g41aab920b
5256
FIND_PACKAGE_ARGS CONFIG
5357
)
5458

@@ -64,46 +68,48 @@ FetchContent_Declare(
6468
stduuid
6569
GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
6670
GIT_SHALLOW TRUE
71+
GIT_TAG v1.2.2
6772
FIND_PACKAGE_ARGS CONFIG
6873
)
6974

7075
FetchContent_Declare(
7176
yaml-cpp
7277
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
7378
GIT_SHALLOW TRUE
79+
GIT_TAG yaml-cpp-0.7.0-33-gc73ee34
7480
FIND_PACKAGE_ARGS CONFIG
7581
)
7682

7783

7884
FetchContent_Declare(
7985
spirv_cross_core
8086
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
81-
GIT_TAG vulkan-sdk-1.3.296
87+
GIT_TAG vulkan-sdk-1.3.268.0-8-g4818f7e7
8288
GIT_SHALLOW TRUE
8389
FIND_PACKAGE_ARGS CONFIG
8490
)
8591

8692
FetchContent_Declare(
87-
VulkanMemoryAllocator
88-
GIT_REPOSITORY
89-
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
93+
VulkanMemoryAllocator
94+
GIT_REPOSITORY https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
9095
GIT_SHALLOW TRUE
96+
GIT_TAG v2.1.0-982-g1d8f600
9197
FIND_PACKAGE_ARGS CONFIG
92-
)
98+
)
9399

94100
FetchContent_Declare(
95101
SPIRV-Headers
96102
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
97103
GIT_SHALLOW TRUE
98-
GIT_TAG main
104+
GIT_TAG 1.5.4.raytracing.fixed-353-g7d500c4
99105
FIND_PACKAGE_ARGS CONFIG
100106
)
101107

102108
FetchContent_Declare(
103109
glslang
104110
GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
105111
GIT_SHALLOW TRUE
106-
GIT_TAG main-tot
112+
GIT_TAG 11.1.0-946-g32257786
107113
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
108114
FIND_PACKAGE_ARGS CONFIG
109115
)
@@ -113,7 +119,7 @@ FetchContent_Declare(
113119
SPIRV-Tools
114120
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
115121
GIT_SHALLOW TRUE
116-
GIT_TAG main
122+
GIT_TAG v2022.4-463-gdda7731e
117123
FIND_PACKAGE_ARGS CONFIG
118124
)
119125

@@ -122,14 +128,15 @@ Fetchcontent_Declare(
122128
GTest
123129
GIT_REPOSITORY https://github.com/google/googletest.git
124130
GIT_SHALLOW TRUE
125-
GIT_TAG main
131+
GIT_TAG release-1.8.0-3394-gb10fad38
126132
FIND_PACKAGE_ARGS CONFIG
127133
)
128134

129135
Fetchcontent_Declare(
130136
nlohmann_json
131137
GIT_REPOSITORY https://github.com/nlohmann/json.git
132138
GIT_SHALLOW TRUE
139+
GIT_TAG v3.11.2-90-g0457de21c
133140
FIND_PACKAGE_ARGS CONFIG
134141
)
135142

@@ -145,7 +152,7 @@ Fetchcontent_Declare(
145152
CLI11
146153
GIT_REPOSITORY https://github.com/CLIUtils/CLI11
147154
GIT_SHALLOW TRUE
148-
GIT_TAG main
155+
GIT_TAG v1.7.1-557-gf75fd22
149156
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
150157
FIND_PACKAGE_ARGS CONFIG
151158
)
@@ -155,21 +162,22 @@ Fetchcontent_Declare(
155162
rapidhash
156163
GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
157164
GIT_SHALLOW TRUE
165+
GIT_TAG rapidhash_v1.0-8-gc1f35e3
158166
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
159167
FIND_PACKAGE_ARGS CONFIG
160168
)
161169

162170
FetchContent_Declare(Vulkan-Headers
163171
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
164172
GIT_SHALLOW TRUE
165-
GIT_TAG v1.3.296
173+
GIT_TAG v1.3.289-8-gb379292
166174
FIND_PACKAGE_ARGS CONFIG NAMES VulkanHeaders
167175
)
168176

169177
FetchContent_Declare(Vulkan-Loader
170178
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
171179
GIT_SHALLOW TRUE
172-
GIT_TAG v1.3.296
180+
GIT_TAG sdk-0.1.0-3544-g40b8e6eee
173181
FIND_PACKAGE_ARGS CONFIG NAMES VulkanLoader
174182
)
175183

@@ -180,7 +188,7 @@ FetchContent_MakeAvailable(
180188
Vulkan-Loader
181189
imgui
182190
ImGuizmo
183-
stbimage
191+
stb
184192
glfw3
185193
spdlog
186194
EnTT

‎vcpkg.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,33 @@
2323
"vulkan-headers",
2424
"vulkan-loader",
2525
"vulkan-memory-allocator"
26+
],
27+
28+
"overrides": [
29+
{"name": "fmt", "version": "8.0.1-8-ge41ac1f8"},
30+
{"name": "stb", "version": "8e51be04dc7dcee462e1f09e410faceab52cc6d2"},
31+
{"name": "glfw3", "version": "3.3-491-gfb0f2f92"},
32+
{"name": "spdlog", "version": "v1.15.3"},
33+
{"name": "entt", "version": "v3.13.0-341-g41aab920b"},
34+
{"name": "assimp", "version": "v5.3.0"},
35+
{"name": "stduuid", "version": "v1.2.2"},
36+
{"name": "yaml-cpp", "version": "yaml-cpp-0.7.0-33-gc73ee34"},
37+
{"name": "spirv-cross", "version": "vulkan-sdk-1.3.268.0-8-g4818f7e7"},
38+
{"name": "vulkan-memory-allocator", "version": "v2.1.0-982-g1d8f600"},
39+
{"name": "spirv-headers", "version": "1.5.4.raytracing.fixed-353-g7d500c4"},
40+
{
41+
"name": {"name": "glslang", "version": "11.1.0-946-g32257786"},
42+
"features": [
43+
{"name": "opt", "version": ""},
44+
"tools"
45+
]
46+
},
47+
{"name": "spirv-tools", "version": "v2022.4-463-gdda7731e"},
48+
{"name": "gtest", "version": "release-1.8.0-3394-gb10fad38"},
49+
{"name": "nlohmann-json", "version": "v3.11.2-90-g0457de21c"},
50+
{"name": "cli11", "version": "v1.7.1-557-gf75fd22"},
51+
{"name": "rapidhash", "version": "rapidhash_v1.0-8-gc1f35e3"},
52+
{"name": "vulkan-headers", "version": "v1.3.289-8-gb379292"},
53+
{"name": "vulkan-loader", "version": "sdk-0.1.0-3544-g40b8e6eee"}
2654
]
2755
}

0 commit comments

Comments
 (0)