Skip to content

Commit d208510

Browse files
MathewBensonMathewBenson
committed
Update Dependencies for linux and vcpkg
 - Add Vcpkg Install Dependencies Variable - install dotnet sdk on ubuntu - Use native cmake to install deps - use install RPATH and PATH variables - set install_rpath for Obelisk - Dependency Rework for linux and macos
1 parent 5bdafbf commit d208510

File tree

11 files changed

+49
-18
lines changed

11 files changed

+49
-18
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ jobs:
3333
3434
- name: Update the list of packages after we added packages.microsoft.com
3535
run: sudo apt-get update
36+
3637
- name: Install development library
37-
run: sudo apt-get install 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 apt-transport-https software-properties-common gcc g++ powershell clang-format-20 libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libyaml-cpp-dev nlohmann-json3-dev libcli11-dev libspirv-cross-c-shared-dev spirv-tools glslang-dev glslang-tools dotnet-runtime-8.0 libgtest-dev
38+
run: sudo apt-get install 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 apt-transport-https software-properties-common gcc g++ powershell clang-format-20 libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libyaml-cpp-dev nlohmann-json3-dev libcli11-dev libspirv-cross-c-shared-dev spirv-tools glslang-dev glslang-tools dotnet-runtime-8.0 libgtest-dev dotnet-sdk-8.0
3839

3940
- name: CMake Build
4041
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}
@@ -44,6 +45,7 @@ jobs:
4445
uses: actions/upload-artifact@v4
4546
with:
4647
name: Build-linux-${{inputs.configuration}}
48+
if-no-files-found: error
4749
path: |
48-
Result.Linux.x64.${inputs.configuration}}/bin
49-
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests/
50+
Result.Linux.x64.${{inputs.configuration}}/bin
51+
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
uses: actions/upload-artifact@v4
3838
with:
3939
name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}}
40+
if-no-files-found: error
4041
path: |
41-
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/bin
42+
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/bin/
4243
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
uses: actions/upload-artifact@v4
6262
with:
6363
name: Build-Windows-x64-${{inputs.configuration}}
64+
if-no-files-found: error
6465
path: |
65-
Result.Windows.x64.MultiConfig/bin
66+
Result.Windows.x64.MultiConfig/bin/
6667
Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ jobs:
1919
steps:
2020
- uses: actions/download-artifact@v4
2121
with:
22-
path: Result.Linux.x64.${{ inputs.configuration }}
2322
name: Build-linux-Release
23+
path: Result.Linux.x64.${{ inputs.configuration }}
2424

2525
- name: Publish Artifacts
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: linux-${{ inputs.configuration }}
2929
path: Result.Linux.x64.${{inputs.configuration}}/bin
30+
if-no-files-found: error

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ 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
32+
path: Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/bin/
33+
if-no-files-found: error

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ jobs:
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: Windows-x64-${{ inputs.configuration }}
29+
if-no-files-found: error
2930
path: |
3031
Result.Windows.x64.MultiConfig/bin

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
configuration:
99
type: string
1010
default: 'Debug'
11+
architecture:
12+
type: string
13+
default: 'x64'
1114

1215
jobs:
1316
test:
@@ -24,6 +27,7 @@ jobs:
2427
uses: actions/download-artifact@v4
2528
with:
2629
name: Build-linux-${{ inputs.configuration }}
30+
path: Result.Linux.${{inputs.architecture}}.${{ inputs.configuration }}
2731

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

‎CMakePresets.json‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"binaryDir": "Result.Windows.x64.MultiConfig",
6464
"architecture": "x64",
6565
"cacheVariables": {
66+
"CMAKE_INSTALL_RPATH": "Result.Windows.x64.MultiConfig",
6667
"CMAKE_CONFIGURATION_TYPES": "Debug"
6768
}
6869

@@ -84,6 +85,8 @@
8485
"generator": "Xcode",
8586
"cacheVariables": {
8687
"BUILD_FRAMEWORK": "ON",
88+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Debug",
89+
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Debug",
8790
"CMAKE_CONFIGURATION_TYPES": "Debug"
8891
}
8992
},
@@ -94,6 +97,8 @@
9497
"binaryDir": "Result.Darwin.x64.Release",
9598
"cacheVariables": {
9699
"CMAKE_BUILD_TYPE": "Release",
100+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Release",
101+
"CMAKE_INSTALL_RPATH": "Result.Darwin.x64.Release",
97102
"CMAKE_CONFIGURATION_TYPES": "Release"
98103
}
99104
},
@@ -102,22 +107,34 @@
102107
"name": "Darwin_arm64_Debug",
103108
"inherits": "Darwin_x64_Debug",
104109
"binaryDir": "Result.Darwin.arm64.Debug",
105-
"displayName": "Darwin ARM XCode Debug"
110+
"displayName": "Darwin ARM XCode Debug",
111+
"cacheVariables": {
112+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
113+
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
114+
}
106115
},
107116

108117
{
109118
"name": "Darwin_arm64_Release",
110119
"inherits": "Darwin_x64_Release",
111120
"binaryDir": "Result.Darwin.arm64.Release",
112-
"displayName": "Darwin ARM XCode Release"
121+
"displayName": "Darwin ARM XCode Release",
122+
"cacheVariables": {
123+
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug",
124+
"CMAKE_INSTALL_RPATH": "Result.Darwin.arm64.Debug"
125+
}
113126
},
114127

115128
{
116129
"name": "Linux_x64_Debug",
117130
"inherits": "BaseOptions",
118131
"displayName": "Linux Ninja Debug",
119132
"binaryDir": "Result.Linux.x64.Debug",
120-
"generator": "Ninja"
133+
"generator": "Ninja",
134+
"cacheVariables": {
135+
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Debug",
136+
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Debug"
137+
}
121138
},
122139
{
123140
"name": "Linux_x64_Release",
@@ -126,6 +143,8 @@
126143
"binaryDir": "Result.Linux.x64.Release",
127144
"generator": "Ninja",
128145
"cacheVariables": {
146+
"CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Release",
147+
"CMAKE_INSTALL_RPATH": "Result.Linux.x64.Release",
129148
"CMAKE_BUILD_TYPE": "Release"
130149
}
131150
}

‎Obelisk/CMakeLists.txt‎

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

50+
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PATH}/bin/Editor)
51+
5052
install(DIRECTORY ../Resources/Editor DESTINATION bin)
5153

5254
install(TARGETS ${TARGET_NAME}
5355
RUNTIME DESTINATION bin/Editor
5456
)
5557

58+
install(IMPORTED_RUNTIME_ARTIFACTS Vulkan::Loader glfw
59+
DESTINATION bin/Editor
60+
)
61+
5662
install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)

‎Tetragrama/Messengers/Messenger.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ namespace Tetragrama::Messengers
141141
// catch (...)
142142
//{
143143
//}
144+
return {};
144145
}
145146

146147
template <typename TRecipient, typename TMessage>

0 commit comments

Comments
 (0)