Skip to content

Commit 34dc6ac

Browse files
glfw vcpkg and macos path
1 parent 1fb846f commit 34dc6ac

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
shell: pwsh
3232

3333
- name: Update access permission of ZEngineTests
34-
run: chmod +x ../builds/RendererEngine/ZEngine/tests/ZEngineTests
34+
run: chmod +x ../builds/RendererEngine/ZEngine/tests/${{inputs.configuration}}/ZEngineTests
3535

3636
- name: Run Tests
3737
run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
env:
2929
VCPKG_BUILD_TYPE: ${{ inputs.configuration }}
3030
CMAKE_TOOLCHAIN_FILE: "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
31-
run: vcpkg install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
31+
run: vcpkg install vulkan-headers vulkan-loader vulkan-tools assimp spirv-headers spirv-tools spirv-cross glslang glfw3 glew yaml-cpp spdlog googletest
3232
shell: pwsh
3333

3434
- name: CMake Build

Scripts/RunTests.ps1

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,21 @@ function RunTests {
5454
[string]$Configuration
5555
)
5656

57-
[string]$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
57+
[string]$testExecutablePath = ""
58+
switch ($SystemName) {
59+
"Windows" {
60+
$testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe")
61+
}
62+
"Darwin" {
63+
$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
64+
}
65+
"Linux" {
66+
$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/ZEngineTests"
67+
}
68+
Default {
69+
throw 'This system is not supported'
70+
}
71+
}
5872

5973
# Check if the executable exists
6074
if (Test-Path $testExecutablePath) {

0 commit comments

Comments
 (0)