Skip to content

Commit 3d99c47

Browse files
cmake install workflow
1 parent 407a668 commit 3d99c47

5 files changed

Lines changed: 27 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: brew install llvm
3131

3232
- name: Install Dependencies
33-
run: brew install assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
33+
run: brew install vulkan-headers vulkan-loader assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
3434

3535
- name: CMake Build
3636
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -Architecture ${{inputs.architecture}} -RunClangFormat 0

.github/workflows/job-test-macOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: Install Dependencies
24-
run: brew install assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest fmt
24+
run: brew install vulkan-headers vulkan-loader assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest fmt
2525

2626
- name: Download Artifacts
2727
uses: actions/download-artifact@v6

CMakePresets.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
"CMAKE_CXX_STANDARD": "20",
1414
"CMAKE_CXX_STANDARD_REQUIRED": "ON",
1515
"CMAKE_CXX_EXTENSIONS": "OFF",
16-
"BUILD_SHARED_LIBS": "OFF",
1716
"FETCHCONTENT_QUIET": "OFF",
1817

19-
"FMT_MODULE": "OFF",
2018
"VULKAN_HEADERS_ENABLE_INSTALL": "ON",
2119
"ENTT_INCLUDE_HEADERS": "ON",
2220

Scripts/BuildEngine.ps1

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,24 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
174174
throw "cmake failed to install to '$install_directory'"
175175
}
176176
}
177+
178+
$install_directory =""
179+
180+
if($IsWindows){
181+
$install_directory = "Result.$systemName.$architecture.MultiConfig"
182+
}
183+
184+
else{
185+
$install_directory = "Result.$systemName.$architecture.$configuration"
186+
}
187+
188+
$installProcess = Start-Process $cMakeProgram -ArgumentList "--install $install_directory --prefix $install_directory" -NoNewWindow -PassThru
189+
190+
$installProcess.WaitForExit();
191+
192+
if($installProcess.ExitCode -ne 0){
193+
throw "cmake failed to install to '$install_directory'"
194+
}
177195
}
178196

179197
if(-Not $LauncherOnly) {

vcpkg.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
"spirv-tools",
55
"spirv-headers",
66
"assimp",
7-
"glslang",
7+
{
8+
"name": "glslang",
9+
"features": [
10+
"opt",
11+
"tools"
12+
]
13+
},
814
"nlohmann-json",
915
"gtest",
1016
"glfw3",

0 commit comments

Comments
 (0)