presets for different operating systems

Author: MathewBensonCode

.github/workflows/Engine-CI.yml

@@ -24,3 +24,9 @@ jobs:
     uses: ./.github/workflows/macOS-build.yml
     with:
       targetFramework: net8.0
+
+  linux:
+    needs: clang-format
+    uses: ./.github/workflows/linux-build.yml
+    with:
+      targetFramework: net8.0

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

@@ -1,12 +1,21 @@
 name: ZEngine Cmake Linux Workflow
 
 on:
-  push:
-    branches: [ header-reorganization ]
+  workflow_call:
+    inputs:
+      targetFramework:
+        type: string
+        required: true
+      configuration:
+        type: string
+        default: 'Debug'
+      architecture:
+        type: string
+        default: 'x64'
 
 jobs:
   Linux-Build:
-    name: cmake-build-linux-debug
+    name: cmake-build-linux-$${{ inputs.configuration }}
     runs-on: ubuntu-24.04
 
     steps:
@@ -20,9 +29,9 @@ jobs:
       run: sudo apt-get update && sudo apt-get install -y git 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 gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev powershell
 
     - name: CMake Build
-      run: .\Scripts\BuildEngine.ps1 -Configurations 'Debug' -RunClangFormat 0
+      run: .\Scripts\BuildEngine.ps1 -Configurations ${{ inputs.configuration }} -RunClangFormat 0
       shell: pwsh
 
     - name: Run Tests
-      run: .\Scripts\RunTests.ps1 -Configurations 'Debug'
+      run: .\Scripts\RunTests.ps1 -Configurations ${{ inputs.configuration }}
       shell: pwsh

.github/workflows/linux-build.yml

@@ -3,10 +3,11 @@
 name: ZEngine Linux Build
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  workflow_call:
+    inputs:
+      targetFramework:
+        type: string
+        required: true
 
 jobs:
   Linux-Build:
@@ -15,9 +16,9 @@ jobs:
       matrix:
           buildConfiguration: [Debug, Release]
 
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+    uses: ./.github/workflows/job-cmakebuild-linux.yml
+    with:
+      configuration: ${{matrix.buildConfiguration}}
 
 #     - name: Checkout submodules
 #       run: git submodule update --init --recursive

CMakePresets.json

@@ -7,9 +7,9 @@
     },
     "configurePresets":[
         {
-            "name": "Debug",
-            "displayName": "Default Config Ninja Debug",
-            "generator": "Ninja",
+            "name": "Debug_Windows",
+            "displayName": "Windows Visual Studio Debug",
+            "generator": "Visual Studio 2022",
             "binaryDir": "${sourceDir}/../builds/RendererEngine",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
@@ -59,22 +59,73 @@
             }
         },
         {
-            "name": "Release",
-            "inherits": "Debug",
-            "displayName": "Default Config Ninja Release",
+            "name": "Release_Windows",
+            "displayName": "Windows Visual Studio Release",
+            "inherits": "Debug_Windows",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
+                "CMAKE_BUILD_TYPE": "Release"
             }
-        }
+        },
+
+        # Mac Os
+        {
+            "name": "Debug_MacOS",
+            "inherits": "Debug_Windows",
+            "displayName": "MacOS XCode Debug",
+            "generator": "Xcode",
+        },
+        {
+            "name": "Release_MacOS",
+            "inherits": "Release_Windows",
+            "displayName": "MacOS XCode Release",
+            "generator": "Xcode"
+        },
+
+        # Linux
+        {
+            "name": "Debug_Linux",
+            "inherits": "Debug_Windows",
+            "displayName": "Linux Ninja Debug",
+            "generator": "Xcode",
+        },
+        {
+            "name": "Release_Linux",
+            "inherits": "Release_Windows",
+            "displayName": "Linux Ninja Release",
+            "generator": "Xcode"
+        },
+
+
     ],
     "buildPresets": [
+        # Windows Builds
+        {
+            "name": "Windows_Debug_Build",
+            "configurePreset": "Windows_Debug"
+        },
+        {
+            "name": "Windows_Release_Build",
+            "configurePreset": "Windows_Release"
+        },
+
+        # MacOS Builds
+        {
+            "name": "MacOS_Debug_Build",
+            "configurePreset": "MacOS_Debug"
+        },
+        {
+            "name": "MacOS_Release_Build",
+            "configurePreset": "MacOS_Release"
+        },
+
+        # Linux Builds
         {
-            "name": "Debug",
-            "configurePreset": "Debug"
+            "name": "Linux_Debug_Build",
+            "configurePreset": "Linux_Debug"
         },
         {
-            "name": "Release",
-            "configurePreset": "Release"
+            "name": "Linux_Release_Build",
+            "configurePreset": "Linux_Release"
         }
     ]
 }

Scripts/BuildEngine.ps1

@@ -84,7 +84,28 @@ if ($IsWindows) {
 
 function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
 
-    $cMakeArguments = "--preset $Configuration"
+    # Define CMake Preset argument
+    switch ($systemName) {
+        "Windows" {
+            switch ($VsVersion) {
+                2022 {
+                    $cMakePreset = "Windows_$configuration"
+                }
+                Default {
+                    throw 'This version of Visual Studio is not supported'
+                }
+            }
+        }
+        "Linux" {
+            # Set Linux build compiler
+            $cMakePreset = "Linux_$configuration"
+        }
+        "Darwin" {
+            $cMakePreset = "MacOS_$configuration"
+        }
+    }
+
+    $cMakeArguments = "--preset $cmakePreset"
 
     # CMake Generation process
     Write-Host $cMakeArguments
@@ -96,7 +117,8 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     # CMake Build Process
     #
     if ($runBuild) {
-        $buildArguments = "--build --preset $Configuration"
+
+        $buildArguments = "--build --preset $cmakePreset_Build"
 
         $buildProcess = Start-Process $cMakeProgram -ArgumentList $buildArguments -NoNewWindow -PassThru