Pull Request #462 Requested Changes

- install llvm20 for linux workflow and configure clang-format search
  paths for different linux options.

- ShaderC download for linux matches the other systems and the previous
  hack to use system versions reverted.

- Renamed the cmake imported targets for the ZEngine and Tetragrama
  dependencies.

- Reatructured compile options and definitions for imgui, imguizmo and
  zengine

- removed some erroneously included changes as requested.

clang-format-20 ubuntu

Author: MathewBenson

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

@@ -25,11 +25,17 @@ jobs:
     - name: Register the Microsoft repository GPG keys
       run: sudo dpkg -i packages-microsoft-prod.deb
 
+    - name: Install LLVM-20
+      run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 20
+
     - name: Update the list of packages after we added packages.microsoft.com
       run: sudo apt-get update
 
     - name: Install development library
-      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 glslang-tools libwayland-dev libxkbcommon-dev
+      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
 
     - name: CMake Build
       run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}

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

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          path: Result.Darwin.x64.${{ inputs.configuration }}
+          path: Result.Linux.x64.${{ inputs.configuration }}
           name: Build-linux-Release
 
       - name: Publish Artifacts

.github/workflows/linux-build.yml

@@ -1,5 +1,3 @@
-# @JeanPhilippeKernel 
-#
 name: ZEngine Linux Build
 
 on:

Scripts/PostBuild.ps1

@@ -43,7 +43,11 @@ $ErrorActionPreference = "Stop"
 $TargetFramework = 'net8.0'
 
 [string]$RepoRoot = [IO.Path]::Combine($PSScriptRoot, "..")
-[string]$OuputBuildDirectory =  [IO.Path]::Combine($RepoRoot, "../builds/RendererEngine")
+[string]$OuputBuildDirectory = If($IsWindows) {
+    [IO.Path]::Combine($RepoRoot, "Result.Windows.x64.MultiConfig")
+}  Else {
+    [IO.Path]::Combine($RepoRoot, "Result.$SystemName.x64.$Configurations")
+}
 
 if($LauncherOnly) {
     Write-Host "Skipping resources copy..."

Scripts/Shared.ps1

@@ -185,31 +185,40 @@ function Find-GlslangValidator () {
 
 function Find-ClangFormat () {
     $repoConfiguration = Get-RepositoryConfiguration
+    $LLVMMinimumVersion = $repoConfiguration.Requirements.LLVM.Version
+    $LLVMMaximumVersion = $repoConfiguration.Requirements.LLVM.MaximumVersion
 
     $candidates = @(
-        'clang-format'
         if ($IsMacOS) {
             $brewPrefixPath = Invoke-Expression -Command "& brew --prefix"
             Join-Path $brewPrefixPath -ChildPath 'opt/llvm/bin/clang-format'
         }
         if ($IsWindows) {
             Join-Path -Path $env:ProgramFiles -ChildPath 'LLVM\bin\clang-format.exe'
         }
+        if ($IsLinux) {
+            '/usr/bin/clang-format'
+            '/usr/bin/clang-format-20'
+        }
+        'clang-format'
     )
 
     foreach ($candidate in $candidates) {
         $clangFormatCommand = Get-Command $candidate -ErrorAction SilentlyContinue
         if ($clangFormatCommand) {
+            if ((& $clangFormatCommand --version | Out-String) -match "clang-format version ([\d\.]*)") {
+                [Version] $clangFormatVersion = $Matches[1]
+                if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion) -and (CompareVersion $LLVMMaximumVersion $clangFormatVersion)) {
                     return $clangFormatCommand.Source
+                }
+            }
         }
     }
 
+    throw "Failed to find clang-format min $LLVMMinimumVersion max $LLVMMaximumVersion. Tried: " + ($candidates -join ', ')
 }
 
 function Setup-ShaderCCompilerTool () {
-    if($IsLinux) {
-        return
-    }
     $repoConfiguration = Get-RepositoryConfiguration
     $repositoryToolPath = $repoConfiguration.Paths.Tools
 
@@ -220,7 +229,7 @@ function Setup-ShaderCCompilerTool () {
         $outputFile = Join-Path -Path $repositoryToolPath -ChildPath "ShaderCCompiler$outputFileExtension"
         Write-Host "Downloading Shader Compiler Tools..."
 
-        $shaderCToolUrl = IF($IsWindows) {$repoConfiguration.Requirements.ShaderC.Windows.Url} Elseif($IsMacOS) {$repoConfiguration.Requirements.ShaderC.macOS.Url}
+        $shaderCToolUrl = IF($IsWindows) {$repoConfiguration.Requirements.ShaderC.Windows.Url} Elseif($IsMacOS) {$repoConfiguration.Requirements.ShaderC.macOS.Url} Elseif($IsLinux){$repoConfiguration.Requirements.ShaderC.Linux.Url}
         Invoke-WebRequest -Uri $shaderCToolUrl -OutFile $outputFile
 
         # Extract contents

ZEngine/ZEngine/CMakeLists.txt

@@ -7,7 +7,9 @@ source_group (TREE ${PROJECT_SOURCE_DIR}/../Resources PREFIX "Resources Files" F
 
 # ZEngine source files
 #
-add_library (zEngineLib STATIC ${CPP_FILES_LIST})
+add_library (zEngineLib STATIC)
+
+target_sources(zEngineLib PRIVATE ${CPP_FILES_LIST})
 
 target_include_directories (zEngineLib
 	PUBLIC
@@ -48,19 +50,26 @@ target_include_directories (zEngineLib
 
 target_precompile_headers(zEngineLib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pch.h)
 
+target_compile_definitions(zEngineLib PUBLIC GLM_ENABLE_EXPERIMENTAL)
+
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 	target_compile_definitions (zEngineLib PUBLIC ENABLE_VULKAN_VALIDATION_LAYER)
 endif()
+
 target_compile_definitions (zEngineLib
 	PUBLIC
 		ZENGINE_PLATFORM
 		ENABLE_VULKAN_SYNCHRONIZATION_LAYER
 		YAML_CPP_STATIC_DEFINE
 )
 
-target_link_libraries (zEngineLib PUBLIC imported::External_libs)
+target_link_libraries (zEngineLib PUBLIC imported::ZEngine_External_Dependencies)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	target_link_libraries (zEngineLib PUBLIC imported::cppwinrt_headers WindowsApp.lib)
     target_compile_definitions(zEngineLib PUBLIC NOMINMAX)
 endif()
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    target_link_libraries(zEngineLib PUBLIC stdc++fs)
+endif ()

__externals/externals.cmake

@@ -8,21 +8,12 @@ add_subdirectory (${EXTERNAL_DIR}/imgui)
 add_library(ImGuizmo)
 
 target_sources(ImGuizmo PRIVATE
-    ${EXTERNAL_DIR}/ImGuizmo/ImGuizmo.cpp)
-
-target_include_directories(ImGuizmo PUBLIC ${EXTERNAL_DIR})
-
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    target_compile_definitions (ImGuizmo PUBLIC ENABLE_VULKAN_VALIDATION_LAYER)
-endif()
+    ${EXTERNAL_DIR}/ImGuizmo/ImGuizmo.cpp
+)
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    target_compile_definitions (ImGuizmo PUBLIC VK_USE_PLATFORM_WIN32_KHR)
-endif()
+target_compile_definitions(ImGuizmo PUBLIC IMGUI_DEFINE_MATH_OPERATORS)
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    target_link_libraries(ImGuizmo PUBLIC stdc++fs)
-endif ()
+target_include_directories(ImGuizmo PUBLIC ${EXTERNAL_DIR}/ImGuizmo)
 
 target_link_libraries(ImGuizmo PUBLIC imgui)
 
@@ -45,17 +36,17 @@ add_subdirectory (${EXTERNAL_DIR}/rapidhash)
 add_subdirectory (${EXTERNAL_DIR}/CLI11)
 add_subdirectory (${EXTERNAL_DIR}/nlohmann_json)
 
-add_library (ZEngineLibs INTERFACE)
-add_library(TetragramaLibs INTERFACE)
+add_library (ZEngine_External_Dependencies INTERFACE)
+add_library(Tetragrama_External_Dependencies INTERFACE)
 
-target_include_directories(ZEngineLibs INTERFACE ${EXTERNAL_DIR})
+target_include_directories(ZEngine_External_Dependencies INTERFACE ${EXTERNAL_DIR})
 
-target_link_libraries(TetragramaLibs INTERFACE
+target_link_libraries(Tetragrama_External_Dependencies INTERFACE
     CLI11::CLI11
     nlohmann_json::nlohmann_json
 )
 
-target_link_libraries(ZEngineLibs INTERFACE
+target_link_libraries(ZEngine_External_Dependencies INTERFACE
     fmt::fmt
     glm::glm
     ImGuizmo
@@ -74,7 +65,6 @@ target_link_libraries(ZEngineLibs INTERFACE
     rapidhash
 )
 
-target_compile_definitions(ZEngineLibs INTERFACE GLM_ENABLE_EXPERIMENTAL)
 
-add_library(imported::External_libs ALIAS ZEngineLibs)
-add_library(imported::External_editorLibs ALIAS TetragramaLibs)
+add_library(imported::ZEngine_External_Dependencies ALIAS ZEngine_External_Dependencies)
+add_library(imported::External_editorLibs ALIAS Tetragrama_External_Dependencies)

__externals/imgui/CMakeLists.txt

@@ -30,4 +30,13 @@ target_link_libraries(imgui PUBLIC
     Vulkan::Headers
     Vulkan::Loader)
 
-target_compile_definitions(imgui PUBLIC GLFW_INCLUDE_VULKAN IMGUI_DEFINE_MATH_OPERATORS)
+target_compile_definitions(imgui PUBLIC GLFW_INCLUDE_VULKAN )
+
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    target_compile_definitions (imgui PUBLIC ENABLE_VULKAN_VALIDATION_LAYER)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    target_compile_definitions (imgui PUBLIC VK_USE_PLATFORM_WIN32_KHR)
+endif()
+

repoConfiguration.json

@@ -10,6 +10,9 @@
             },
             "macOS": {
                 "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/macos/continuous_clang_release/472/20240708-061139/install.tgz"
+            },
+            "Linux": {
+                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_gcc_release/500/20250807-100822/install.tgz"
             }
         },
         "GlslangValidator": {
@@ -24,4 +27,4 @@
             "MaximumVersion": "20.2.0"
         }
     }
-}
+}