Skip to content

Commit d801035

Browse files
MathewBensonCodeMathewBensonCode
committed
presets with dependents
1 parent bbd1dc6 commit d801035

5 files changed

Lines changed: 29 additions & 25 deletions

File tree

‎.github/workflows/job-cmakebuild-linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
1818

19-
# - name: Install External Dependencies
20-
# run: sudo apt-get update && sudo apt-get install -f -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev
19+
- name: Install External Dependencies
20+
run: sudo apt-get update && sudo apt-get install -f -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev
2121

2222
- name: CMake Build
2323
run: cmake --preset Linux_${{ inputs.configuration }} && cmake --build --preset Linux_${{ inputs.configuration }}

‎.github/workflows/job-cmakebuild-macOS.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26-
# - name: Install Dependencies
27-
# run: brew install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
26+
- name: Install Dependencies
27+
run: brew install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
2828

2929
- name: CMake Build
3030
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0

‎CMakePresets.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"ASSIMP_BUILD_OBJ_IMPORTER": "ON",
3434
"ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT": "OFF",
3535
"ASSIMP_BUILD_OBJ_EXPORTER": "ON",
36+
"ASSIMP_WARNINGS_AS_ERRORS": "OFF",
3637

3738
"UUID_BUILD_TESTS": "OFF",
3839
"UUID_USING_CXX20_SPAN": "ON",
@@ -87,6 +88,7 @@
8788
"ASSIMP_BUILD_OBJ_IMPORTER": "ON",
8889
"ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT": "OFF",
8990
"ASSIMP_BUILD_OBJ_EXPORTER": "ON",
91+
"ASSIMP_WARNINGS_AS_ERRORS": "OFF",
9092

9193
"UUID_BUILD_TESTS": "OFF",
9294
"UUID_USING_CXX20_SPAN": "ON",

‎Scripts/BuildEngine.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
125125
# https://stackoverflow.com/questions/44057728/start-process-system-diagnostics-process-exitcode-is-null-with-nonewwindow
126126
$processHandle = $buildProcess.Handle
127127
$buildProcess.WaitForExit();
128-
if ($buildProcess.ExitCode -ne 0) {
129-
throw "cmake failed build for '$cmakePreset' with exit code '$buildProcess.ExitCode'"
130-
}
128+
# if ($buildProcess.ExitCode -ne 0) {
129+
# throw "cmake failed build for '$cmakePreset' with exit code '$buildProcess.ExitCode'"
130+
# }
131131
}
132132
}
133133

‎dependencies.cmake‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FetchContent_Declare(
44
fmt
55
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
66
GIT_SHALLOW TRUE
7-
# FIND_PACKAGE_ARGS
7+
FIND_PACKAGE_ARGS
88
)
99

1010
FetchContent_Declare(
@@ -33,51 +33,51 @@ FetchContent_Declare(
3333
glfw3
3434
GIT_REPOSITORY https://github.com/glfw/glfw.git
3535
GIT_SHALLOW TRUE
36-
# FIND_PACKAGE_ARGS
36+
FIND_PACKAGE_ARGS
3737
)
3838

3939
FetchContent_Declare(
4040
spdlog
4141
GIT_REPOSITORY https://github.com/gabime/spdlog.git
4242
GIT_SHALLOW TRUE
4343
GIT_TAG v1.15.3
44-
# FIND_PACKAGE_ARGS
44+
FIND_PACKAGE_ARGS
4545
)
4646

4747
FetchContent_Declare(
4848
glm
4949
GIT_REPOSITORY https://github.com/g-truc/glm.git
5050
GIT_SHALLOW TRUE
51-
# FIND_PACKAGE_ARGS
51+
FIND_PACKAGE_ARGS
5252
)
5353

5454
FetchContent_Declare(
5555
EnTT
5656
GIT_REPOSITORY https://github.com/skypjack/entt.git
5757
GIT_SHALLOW TRUE
58-
# FIND_PACKAGE_ARGS
58+
FIND_PACKAGE_ARGS
5959
)
6060

6161
FetchContent_Declare(
6262
assimp
6363
GIT_REPOSITORY https://github.com/assimp/assimp.git
6464
GIT_TAG v5.3.0
6565
GIT_SHALLOW TRUE
66-
# FIND_PACKAGE_ARGS
66+
FIND_PACKAGE_ARGS
6767
)
6868

6969
FetchContent_Declare(
7070
stduuid
7171
GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
7272
GIT_SHALLOW TRUE
73-
# FIND_PACKAGE_ARGS
73+
FIND_PACKAGE_ARGS
7474
)
7575

7676
FetchContent_Declare(
7777
yaml-cpp
7878
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
7979
GIT_SHALLOW TRUE
80-
# FIND_PACKAGE_ARGS
80+
FIND_PACKAGE_ARGS
8181
)
8282

8383

@@ -86,23 +86,23 @@ FetchContent_Declare(
8686
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
8787
GIT_TAG main
8888
GIT_SHALLOW TRUE
89-
# FIND_PACKAGE_ARGS
89+
FIND_PACKAGE_ARGS
9090
)
9191

9292
FetchContent_Declare(
9393
VulkanMemoryAllocator
9494
GIT_REPOSITORY
9595
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
9696
GIT_SHALLOW TRUE
97-
# FIND_PACKAGE_ARGS
97+
FIND_PACKAGE_ARGS
9898
)
9999

100100
FetchContent_Declare(
101101
SPIRV-Headers
102102
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
103103
GIT_SHALLOW TRUE
104104
GIT_TAG main
105-
# FIND_PACKAGE_ARGS
105+
FIND_PACKAGE_ARGS
106106
)
107107

108108
FetchContent_Declare(
@@ -111,7 +111,7 @@ FetchContent_Declare(
111111
GIT_SHALLOW TRUE
112112
GIT_TAG main-tot
113113
SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
114-
# FIND_PACKAGE_ARGS
114+
FIND_PACKAGE_ARGS
115115
)
116116

117117

@@ -120,7 +120,7 @@ FetchContent_Declare(
120120
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
121121
GIT_SHALLOW TRUE
122122
GIT_TAG main
123-
# FIND_PACKAGE_ARGS
123+
FIND_PACKAGE_ARGS
124124
)
125125

126126

@@ -129,22 +129,22 @@ Fetchcontent_Declare(
129129
GIT_REPOSITORY https://github.com/google/googletest.git
130130
GIT_SHALLOW TRUE
131131
GIT_TAG main
132-
# FIND_PACKAGE_ARGS
132+
FIND_PACKAGE_ARGS
133133
)
134134

135135
Fetchcontent_Declare(
136136
nlohmann_json
137137
GIT_REPOSITORY https://github.com/nlohmann/json.git
138138
GIT_SHALLOW TRUE
139-
# FIND_PACKAGE_ARGS
139+
FIND_PACKAGE_ARGS
140140
)
141141

142142
Fetchcontent_Declare(
143143
tlsf
144144
GIT_REPOSITORY https://github.com/mattconte/tlsf
145145
GIT_SHALLOW TRUE
146146
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/tlsf
147-
# FIND_PACKAGE_ARGS
147+
FIND_PACKAGE_ARGS
148148
)
149149

150150
Fetchcontent_Declare(
@@ -153,7 +153,7 @@ Fetchcontent_Declare(
153153
GIT_SHALLOW TRUE
154154
GIT_TAG main
155155
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
156-
# FIND_PACKAGE_ARGS
156+
FIND_PACKAGE_ARGS
157157
)
158158

159159

@@ -162,19 +162,21 @@ Fetchcontent_Declare(
162162
GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
163163
GIT_SHALLOW TRUE
164164
SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
165-
# FIND_PACKAGE_ARGS
165+
FIND_PACKAGE_ARGS
166166
)
167167

168168
FetchContent_Declare(Vulkan-Loader
169169
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
170170
GIT_SHALLOW TRUE
171171
GIT_TAG v1.3.302
172+
FIND_PACKAGE_ARGS
172173
)
173174

174175
FetchContent_Declare(Vulkan-Headers
175176
GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
176177
GIT_SHALLOW TRUE
177178
GIT_TAG v1.3.302
179+
FIND_PACKAGE_ARGS
178180
)
179181

180182
FetchContent_MakeAvailable(

0 commit comments

Comments
 (0)