Skip to content

Commit 7d0a6d3

Browse files
MathewBensonCodeMathewBensonCode
committed
cmake install workflow
1 parent 0bd9c4c commit 7d0a6d3

17 files changed

Lines changed: 64 additions & 89 deletions

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,5 @@ jobs:
4545
with:
4646
name: Build-linux-${{inputs.configuration}}
4747
path: |
48-
Result.Linux.x64.${inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net8.0/publish
49-
Result.Linux.x64.${{inputs.configuration}}/_deps/vulkan-loader-build/loader/
48+
Result.Linux.x64.${inputs.configuration}}/bin
5049
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests/
51-
Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.resources.dll
52-
!Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
53-
!Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.resources.dll
54-
!Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.Scripting.resources.dll

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v4
2525

2626
- name: Install Dependencies
27-
run: brew install assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
27+
run: brew install vulkan-headers vulkan-loader 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}} -Architecture ${{inputs.architecture}} -RunClangFormat 0
@@ -35,10 +35,5 @@ jobs:
3535
with:
3636
name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}}
3737
path: |
38-
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/osx-${{ inputs.architecture }}/publish/
39-
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/_deps/vulkan-Loader-build/loader/${{ inputs.configuration }}/
38+
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/bin
4039
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/
41-
!Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.resources.dll
42-
!Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
43-
!Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.resources.dll
44-
!Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.Scripting.resources.dll

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,5 @@ jobs:
6262
with:
6363
name: Build-Windows-x64-${{inputs.configuration}}
6464
path: |
65-
Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/win-x64/publish/
65+
Result.Windows.x64.MultiConfig/bin
6666
Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/
67-
!Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.resources.dll
68-
!Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
69-
!Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.resources.dll
70-
!Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.Scripting.resources.dll
71-
!Result.Windows.x64.MultiConfig/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/createdump.exe
72-
73-
- name: Publish Vulkan Build Artifacts
74-
uses: actions/upload-artifact@v4
75-
with:
76-
name: Vulkan-build-x64-${{inputs.configuration}}
77-
path: |
78-
Result.Windows.x64.MultiConfig/vcpkg_installed/x64-windows/bin/vulkan-1.dll
79-
Result.Windows.x64.MultiConfig/vcpkg_installed/x64-windows/lib/vulkan-1.lib

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: linux-${{ inputs.configuration }}
29-
path: Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{ inputs.configuration }}/${{inputs.targetFramework}}/publish/
29+
path: Result.Linux.x64.${{inputs.configuration}}/bin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
uses: actions/upload-artifact@v4
3030
with:
3131
name: macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
32-
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/Panzerfaust/${{ inputs.configuration }}/${{inputs.targetFramework}}/osx-${{ inputs.architecture }}/publish/
32+
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/bin

‎.github/workflows/job-deploy-windows.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ jobs:
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: Windows-x64-${{ inputs.configuration }}
29-
path: Result.Windows.x64.MultiConfig/Panzerfaust/${{ inputs.configuration }}/${{inputs.targetFramework}}/win-x64/publish/
29+
path: |
30+
Result.Windows.x64.MultiConfig/bin

‎.github/workflows/job-test-windows.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
path: Result.Windows.x64.MultiConfig
2424
name: Build-Windows-x64-${{ inputs.configuration }}
2525

26-
- name: Download Vulkan Artifacts
27-
uses: actions/download-artifact@v4
28-
with:
29-
path: vulkan-build
30-
name: Vulkan-build-x64-${{inputs.configuration}}
31-
3226
- name: Run Tests
3327
shell: pwsh
34-
run: |
35-
$env:PATH = ".\vulkan-build\;$env:PATH"
36-
.\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}
28+
run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}

‎CMakeLists.txt‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,3 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
6363
set_property (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Panzerfaust)
6464
endif ()
6565

66-
# Post build operation
67-
#
68-
set (SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
69-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
70-
set (SYSTEM_ARCHITECTURE "x64")
71-
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
72-
set (SYSTEM_ARCHITECTURE "x64")
73-
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
74-
if (MACOSX_ARCHITECTURE_ARM64)
75-
set (SYSTEM_ARCHITECTURE "arm64")
76-
else ()
77-
set (SYSTEM_ARCHITECTURE "x64")
78-
endif ()
79-
endif ()
80-
81-
add_custom_target (AssembleContent ALL
82-
COMMENT "Copying assets and resources contents"
83-
COMMAND pwsh ${CMAKE_CURRENT_SOURCE_DIR}/Scripts/PostBuild.ps1 -SystemName ${SYSTEM_NAME} -Architecture ${SYSTEM_ARCHITECTURE} -Configurations $<IF:$<CONFIG:Debug>,Debug,Release> $<$<BOOL:${LAUNCHER_ONLY}>:-LauncherOnly>
84-
)
85-
86-
if (NOT LAUNCHER_ONLY)
87-
add_dependencies(AssembleContent zEngineLib tetragrama Obelisk)
88-
endif ()
89-
90-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
91-
add_dependencies(AssembleContent Panzerfaust-WinBuild)
92-
else ()
93-
add_dependencies(AssembleContent Panzerfaust)
94-
endif ()

‎CMakePresets.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"binaryDir": "Result.Windows.x64.MultiConfig",
6363
"architecture": "x64",
6464
"cacheVariables": {
65-
"CMAKE_BUILD_TYPE": "Debug",
6665
"CMAKE_CONFIGURATION_TYPES": "Debug"
6766
}
6867

@@ -72,7 +71,6 @@
7271
"displayName": "Windows Visual Studio Release",
7372
"inherits": "Windows_x64_Debug",
7473
"cacheVariables": {
75-
"CMAKE_BUILD_TYPE": "Release",
7674
"CMAKE_CONFIGURATION_TYPES": "Release"
7775
}
7876
},
@@ -84,7 +82,8 @@
8482
"binaryDir": "Result.Darwin.x64.Debug",
8583
"generator": "Xcode",
8684
"cacheVariables": {
87-
"BUILD_FRAMEWORK": "ON"
85+
"BUILD_FRAMEWORK": "ON",
86+
"CMAKE_CONFIGURATION_TYPES": "Debug"
8887
}
8988
},
9089
{
@@ -93,7 +92,8 @@
9392
"displayName": "Darwin XCode Release",
9493
"binaryDir": "Result.Darwin.x64.Release",
9594
"cacheVariables": {
96-
"CMAKE_BUILD_TYPE": "Release"
95+
"CMAKE_BUILD_TYPE": "Release",
96+
"CMAKE_CONFIGURATION_TYPES": "Release"
9797
}
9898
},
9999

‎Obelisk/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ target_compile_definitions(${TARGET_NAME}
4343
)
4444

4545
target_link_libraries(${TARGET_NAME} PRIVATE
46-
zEngineLib
4746
tetragrama
4847
imported::External_obeliskLibs
4948
)
49+
50+
install(DIRECTORY ../Resources/Editor DESTINATION bin)
51+
52+
install(TARGETS ${TARGET_NAME}
53+
RUNTIME DESTINATION bin/Editor
54+
)
55+
56+
install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)

0 commit comments

Comments
 (0)