Skip to content

Commit 403ab72

Browse files
all static
1 parent 3a32780 commit 403ab72

4 files changed

Lines changed: 25 additions & 73 deletions

File tree

CMakePresets.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"CMAKE_CXX_STANDARD": "20",
1414
"CMAKE_CXX_STANDARD_REQUIRED": "ON",
1515
"CMAKE_CXX_EXTENSIONS": "OFF",
16+
"BUILD_SHARED_LIBS": "OFF",
1617
"FETCHCONTENT_QUIET": "OFF",
1718

1819
"VULKAN_HEADERS_ENABLE_INSTALL": "ON",
@@ -52,7 +53,8 @@
5253
"GLSLANG_ENABLE_INSTALL": "ON",
5354
"ALLOW_EXTERNAL_SPIRV_TOOLS": "ON",
5455

55-
"SPIRV_CROSS_ENABLE_TESTS": "OFF"
56+
"SPIRV_CROSS_ENABLE_TESTS": "OFF",
57+
"CMAKE_POLICY_VERSION_MINIMUM": "3.5"
5658
}
5759
},
5860
{

Obelisk/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,18 @@ target_compile_definitions(${TARGET_NAME}
4242
_UNICODE
4343
)
4444

45-
target_link_libraries(${TARGET_NAME} PRIVATE
45+
target_link_libraries(${TARGET_NAME} PUBLIC
4646
tetragrama
4747
imported::External_obeliskLibs
48+
vulkan
4849
)
4950

50-
install(DIRECTORY ../Resources/Editor DESTINATION bin)
5151

5252
install(TARGETS ${TARGET_NAME}
53-
RUNTIME DESTINATION bin/Editor
53+
DESTINATION bin/Editor
54+
RUNTIME_DEPENDENCY_SET tetragrama_dependencies
5455
)
5556

56-
install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)
57+
install(RUNTIME_DEPENDENCY_SET tetragrama_dependencies
58+
DESTINATION bin/Editor
59+
)

dependencies.cmake

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ FetchContent_Declare(
44
fmt
55
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
66
GIT_SHALLOW TRUE
7-
FIND_PACKAGE_ARGS CONFIG
8-
)
7+
)
98

109
FetchContent_Declare(
1110
imgui
@@ -34,42 +33,42 @@ FetchContent_Declare(
3433
glfw3
3534
GIT_REPOSITORY https://github.com/glfw/glfw.git
3635
GIT_SHALLOW TRUE
37-
FIND_PACKAGE_ARGS CONFIG
36+
3837
)
3938

4039
FetchContent_Declare(
4140
spdlog
4241
GIT_REPOSITORY https://github.com/gabime/spdlog.git
4342
GIT_SHALLOW TRUE
44-
FIND_PACKAGE_ARGS CONFIG
43+
GIT_TAG v1.15.3
4544
)
4645

4746
FetchContent_Declare(
4847
EnTT
4948
GIT_REPOSITORY https://github.com/skypjack/entt.git
5049
GIT_SHALLOW TRUE
51-
FIND_PACKAGE_ARGS CONFIG
50+
5251
)
5352

5453
FetchContent_Declare(
5554
assimp
5655
GIT_REPOSITORY https://github.com/assimp/assimp.git
5756
GIT_SHALLOW TRUE
58-
FIND_PACKAGE_ARGS CONFIG
57+
5958
)
6059

6160
FetchContent_Declare(
6261
stduuid
6362
GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
6463
GIT_SHALLOW TRUE
65-
FIND_PACKAGE_ARGS CONFIG
64+
6665
)
6766

6867
FetchContent_Declare(
6968
yaml-cpp
7069
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
7170
GIT_SHALLOW TRUE
72-
FIND_PACKAGE_ARGS CONFIG
71+
7372
)
7473

7574

@@ -98,8 +97,9 @@ FetchContent_Declare(
9897
glslang
9998
GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
10099
GIT_SHALLOW TRUE
100+
GIT_TAG 14.3.0
101101
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
102-
FIND_PACKAGE_ARGS CONFIG
102+
103103
)
104104

105105

@@ -115,22 +115,22 @@ Fetchcontent_Declare(
115115
GTest
116116
GIT_REPOSITORY https://github.com/google/googletest.git
117117
GIT_SHALLOW TRUE
118-
FIND_PACKAGE_ARGS CONFIG
118+
GIT_TAG main
119119
)
120120

121121
Fetchcontent_Declare(
122122
nlohmann_json
123123
GIT_REPOSITORY https://github.com/nlohmann/json.git
124124
GIT_SHALLOW TRUE
125-
FIND_PACKAGE_ARGS CONFIG
125+
126126
)
127127

128128
Fetchcontent_Declare(
129129
tlsf
130130
GIT_REPOSITORY https://github.com/mattconte/tlsf
131131
GIT_SHALLOW TRUE
132132
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/tlsf
133-
FIND_PACKAGE_ARGS CONFIG
133+
134134
)
135135

136136
Fetchcontent_Declare(
@@ -139,7 +139,7 @@ Fetchcontent_Declare(
139139
GIT_SHALLOW TRUE
140140
GIT_TAG main
141141
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
142-
FIND_PACKAGE_ARGS CONFIG
142+
143143
)
144144

145145

@@ -148,7 +148,7 @@ Fetchcontent_Declare(
148148
GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
149149
GIT_SHALLOW TRUE
150150
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
151-
FIND_PACKAGE_ARGS CONFIG
151+
152152
)
153153

154154
FetchContent_Declare(Vulkan-Headers
@@ -273,6 +273,7 @@ target_link_libraries(External_obeliskLibs
273273
INTERFACE
274274
CLI11::CLI11
275275
)
276+
276277
add_library(imported::External_obeliskLibs ALIAS External_obeliskLibs)
277278

278279
include(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/CMake/NuGet.cmake)

vcpkg.json

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)