Skip to content

Commit d4f04f4

Browse files
committed
install tests and vulkan lib
1 parent 74eebb7 commit d4f04f4

File tree

11 files changed

+35
-28
lines changed

11 files changed

+35
-28
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ jobs:
4747
if-no-files-found: error
4848
path: |
4949
Result.Linux.x64.${{inputs.configuration}}/bin
50-
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests
50+
Result.Linux.x64.${{inputs.configuration}}/lib/*vulkan*
51+
Result.Linux.x64.${{inputs.configuration}}/tests

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
if-no-files-found: error
3535
path: |
3636
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/bin/
37-
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/
37+
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/lib/*vulkan*
38+
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/tests

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
if-no-files-found: error
3535
path: |
3636
Result.Windows.x64.MultiConfig/bin/
37-
Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/
37+
Result.Windows.x64.MultiConfig/lib/*vulkan*
38+
Result.Windows.x64.MultiConfig/tests

.github/workflows/job-deploy-linux.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ jobs:
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: linux-${{ inputs.configuration }}
29-
path: Result.Linux.x64.${{inputs.configuration}}/bin
3029
if-no-files-found: error
30+
path: |
31+
Result.Linux.x64.${{inputs.configuration}}/bin
32+
Result.Linux.x64.${{inputs.configuration}}/lib

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ jobs:
2929
uses: actions/upload-artifact@v4
3030
with:
3131
name: macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
32-
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/bin/
3332
if-no-files-found: error
33+
path: |
34+
Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/bin/
35+
Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/lib/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
path: Result.Linux.${{inputs.architecture}}.${{ inputs.configuration }}
3131

3232
- name: Update access permission of ZEngineTests
33-
run: chmod +x ./Result.Linux.x64.${{ inputs.configuration }}/ZEngine/tests/ZEngineTests
33+
run: chmod +x ./Result.Linux.x64.${{ inputs.configuration }}/tests/ZEngineTests
3434

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}
3131

3232
- name: Update access permission of ZEngineTests
33-
run: chmod +x ./Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/ZEngine/tests/${{ inputs.configuration }}/ZEngineTests
33+
run: chmod +x ./Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/tests/ZEngineTests
3434

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

Obelisk/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,7 @@ target_link_libraries(${TARGET_NAME} PUBLIC
4747
imported::External_obeliskLibs
4848
)
4949

50-
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PATH}/bin/Editor)
51-
5250
install(TARGETS ${TARGET_NAME}
53-
RUNTIME DESTINATION bin/Editor
54-
)
55-
56-
install(IMPORTED_RUNTIME_ARTIFACTS vulkan
5751
DESTINATION bin/Editor
5852
)
5953

Scripts/RunTests.ps1

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,22 @@ function RunTests {
6363
[string]$Configuration
6464
)
6565

66-
[string]$testExecutablePath = ""
67-
switch ($SystemName) {
68-
"Windows" {
69-
$testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe")
70-
}
71-
"Darwin" {
72-
$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
73-
}
74-
"Linux" {
75-
$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/ZEngineTests"
76-
}
77-
Default {
78-
throw 'This system is not supported'
79-
}
80-
}
66+
[string]$testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "/tests/ZEngineTests"
67+
68+
# switch ($SystemName) {
69+
# "Windows" {
70+
# $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "ZEngine", "tests", $Configuration, "ZEngineTests.exe")
71+
# }
72+
# "Darwin" {
73+
# $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/$Configuration/ZEngineTests"
74+
# }
75+
# "Linux" {
76+
# $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "ZEngine/tests/ZEngineTests"
77+
# }
78+
# Default {
79+
# throw 'This system is not supported'
80+
# }
81+
# }
8182

8283
# Check if the executable exists
8384
if (Test-Path $testExecutablePath) {

ZEngine/ZEngine/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,5 @@ endif()
7575

7676
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
7777
target_link_libraries(zEngineLib PUBLIC stdc++fs)
78+
target_compile_definitions(zEngineLib PUBLIC VK_USE_PLATFORM_WAYLAND_KHR)
7879
endif ()

0 commit comments

Comments
 (0)