Skip to content

Commit 675c76b

Browse files
MathewBensonCodeMathewBensonCode
committed
fetchcontent with installed packages
1 parent 033b628 commit 675c76b

12 files changed

Lines changed: 21 additions & 34 deletions

File tree

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ jobs:
3131
chmod +x llvm.sh
3232
sudo ./llvm.sh 20
3333
34-
<<<<<<< HEAD
35-
- name: Update the list of packages
36-
run: sudo apt-get update
37-
38-
- name: Install Dependencies
39-
=======
4034
- name: Update the list of packages after we added packages.microsoft.com
4135
run: sudo apt-get update
4236

4337
- name: Install development library
44-
>>>>>>> 68a7dabd (Enable Dependency management with fetchcontent)
45-
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 glslang-tools libwayland-dev libxkbcommon-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 libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-headers spirv-tools glslang-dev glslang-tools nlohmann-json3-dev libcli11-dev
4639

4740
- name: CMake Build
4841
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}
@@ -53,15 +46,9 @@ jobs:
5346
with:
5447
name: Build-linux-${{inputs.configuration}}
5548
path: |
56-
<<<<<<< HEAD
57-
Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/publish/
58-
Result.Linux.x64.${{inputs.configuration}}/__externals/Vulkan-Loader/loader/
59-
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests/ZEngineTests
60-
=======
61-
Result.Linux.x64.${inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net8.0/
49+
Result.Linux.x64.${inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/net8.0/publish
6250
Result.Linux.x64.${{inputs.configuration}}/_deps/vulkan-loader-build/loader/
6351
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests/
64-
>>>>>>> 68a7dabd (Enable Dependency management with fetchcontent)
6552
Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.resources.dll
6653
!Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
6754
!Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.resources.dll

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26+
- name: Install Dependencies
27+
run: brew install assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
28+
2629
- name: CMake Build
2730
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0
2831
shell: pwsh

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,4 @@ jobs:
2626
uses: actions/upload-artifact@v4
2727
with:
2828
name: linux-${{ inputs.configuration }}
29-
<<<<<<< HEAD
3029
path: Result.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{ inputs.configuration }}/${{inputs.targetFramework}}/publish/
31-
=======
32-
path: Results.Linux.x64.${{inputs.configuration}}/Panzerfaust/${{ inputs.configuration }}/${{inputs.targetFramework}}/publish/
33-
>>>>>>> 68a7dabd (Enable Dependency management with fetchcontent)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
- name: Checkout repository
1818
uses: actions/checkout@v4
1919

20+
- name: Install development library
21+
run: sudo apt-get install glslang-tools libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev glslang-dev glslang-tools nlohmann-json3-dev libcli11-dev
22+
2023
- name: Download Artifacts
2124
uses: actions/download-artifact@v4
2225
with:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
steps:
2020
- name: Checkout repository
2121
uses: actions/checkout@v4
22+
23+
- name: Install Dependencies
24+
run: brew install assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest fmt
2225

2326
- name: Download Artifacts
2427
uses: actions/download-artifact@v4

‎Obelisk/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
2626
set_target_properties(${TARGET_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
2727
endif ()
2828

29-
include(${EXTERNAL_DIR}/externals.cmake)
30-
3129
target_include_directories (${TARGET_NAME}
3230
PRIVATE
3331
.
@@ -48,4 +46,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE
4846
zEngineLib
4947
tetragrama
5048
imported::External_obeliskLibs
51-
)
49+
)

‎Obelisk/EntryPoint.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
#include <ZEngine/Core/Memory/MemoryManager.h>
44
#include <ZEngine/EngineConfiguration.h>
55
#include <ZEngine/Logging/Logger.h>
6-
<<<<<<< HEAD:Obelisk/EntryPoint.cpp
76
#include <ZEngine/Applications/GameApplication.h>
87

98
#include <Tetragrama/Editor.h>
10-
=======
11-
>>>>>>> c5669f28 (Enable Dependency management with fetchcontent):Tetragrama/EntryPoint.cpp
129

1310
#ifdef ZENGINE_PLATFORM
1411

‎Scripts/PostBuild.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ $ContentsToProcess = @(
104104
}
105105
"Linux" {
106106
@{ From = "$OuputBuildDirectory\Obelisk"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\$TargetFramework\Editor"}
107-
@{ From = "$OuputBuildDirectory\Obelisk"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\$TargetFramework\publish\Editor"}
107+
@{ From = "$OuputBuildDirectory\Obelisk"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\$TargetFramework\Editor"}
108108
}
109109
Default {
110110
throw 'This system is not supported'

‎ZEngine/ZEngine/Hardwares/AsyncResourceLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define STB_IMAGE_WRITE_IMPLEMENTATION
1313
#define STB_IMAGE_RESIZE_IMPLEMENTATION
14-
#include <stb/stb_image_resize.h>
14+
#include <stb/deprecated/stb_image_resize.h>
1515
#include <stb/stb_image_write.h>
1616

1717
using namespace ZEngine::Helpers;

‎ZEngine/ZEngine/Maths/Math.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <Maths/Math.h>
2-
32
#include <glm/gtx/matrix_decompose.hpp>
43

54
namespace glm

0 commit comments

Comments
 (0)