add fetch_content based config

MathewBensonCode · MathewBensonCode · commit bf8342f98690 · 2025-09-14T07:28:58.000+03:00
diff --git a/.github/workflows/job-cmakebuild-linux.yml b/.github/workflows/job-cmakebuild-linux.yml
@@ -33,9 +33,9 @@ jobs:
 
     - 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-20 libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev nlohmann-json3-dev libcli11-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 libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libyaml-cpp-dev nlohmann-json3-dev libcli11-dev
 
     - name: CMake Build
       run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}
diff --git a/.github/workflows/job-cmakebuild-macOS.yml b/.github/workflows/job-cmakebuild-macOS.yml
@@ -36,7 +36,7 @@ jobs:
           name: Build-macOS-${{ inputs.architecture }}-${{inputs.configuration}}
           path: |
             Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/osx-${{ inputs.architecture }}/publish/
-            Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/_deps/Vulkan-Loader/loader/${{ inputs.configuration }}/
+            Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/_deps/vulkan-Loader-build/loader/${{ inputs.configuration }}/
             Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/
             !Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.resources.dll
             !Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/Panzerfaust/${{inputs.configuration}}/${{inputs.targetFramework}}/**/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,5 @@
 cmake_minimum_required (VERSION 3.17 FATAL_ERROR)
 
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-set	(CMAKE_CXX_STANDARD 20)
-set (CMAKE_CXX_EXTENSIONS OFF)
-
 project (RendererEngine
 	VERSION 1.0
 	DESCRIPTION "Renderer Engine is an open-source 2D - 3D rendering engine written in C/C++"
@@ -71,20 +67,20 @@ endif ()
 #
 set (SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-	set (SYSTEM_ARCHITECTURE "win-x64")
+	set (SYSTEM_ARCHITECTURE "x64")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set (SYSTEM_ARCHITECTURE "linux-x64")
+	set (SYSTEM_ARCHITECTURE "x64")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 	if (MACOSX_ARCHITECTURE_ARM64)
-		set (SYSTEM_ARCHITECTURE "osx-arm64")
+		set (SYSTEM_ARCHITECTURE "arm64")
 	else ()
-		set (SYSTEM_ARCHITECTURE "osx-x64")
+		set (SYSTEM_ARCHITECTURE "x64")
 	endif ()
 endif ()
 
 add_custom_target (AssembleContent ALL
 	COMMENT "Copying assets and resources contents"
-	COMMAND pwsh ${CMAKE_CURRENT_SOURCE_DIR}/Scripts/PostBuild.ps1 -SystemName ${SYSTEM_NAME} -Architectures ${SYSTEM_ARCHITECTURE} -Configurations $<IF:$<CONFIG:Debug>,Debug,Release> $<$<BOOL:${LAUNCHER_ONLY}>:-LauncherOnly>
+	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>
 )
 
 if (NOT LAUNCHER_ONLY)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -10,6 +10,9 @@
             "name": "BaseOptions",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_CXX_STANDARD": "20",
+                "CMAKE_CXX_STANDARD_REQUIRED": "ON",
+                "CMAKE_CXX_EXTENSIONS": "OFF",
 
                 "VULKAN_HEADERS_ENABLE_INSTALL": "ON",
                 "ENTT_INCLUDE_HEADERS": "ON",
@@ -40,13 +43,12 @@
                 "YAML_CPP_FORMAT_SOURCE": "OFF",
                 "YAML_BUILD_SHARED_LIBS": "OFF",
 
-                "USE_MASM": "OFF",
                 "USE_GAS": "OFF",
 
                 "SPIRV_SKIP_EXECUTABLES": "ON",
                 "SPIRV_SKIP_TESTS": "ON",
-                "GLSLANG_ENABLE_INSTALL": "ON",
-                "ALLOW_EXTERNAL_SPIRV_TOOLS": "OFF",
+                "GLSLANG_ENABLE_INSTALL": "OFF",
+                "ALLOW_EXTERNAL_SPIRV_TOOLS": "ON",
 
                 "SPIRV_CROSS_ENABLE_TESTS": "OFF",
                 "CMAKE_POLICY_VERSION_MINIMUM": "3.5"
@@ -61,6 +63,7 @@
             "architecture": "x64",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
+                "USE_MASM": "OFF",
                 "CMAKE_CONFIGURATION_TYPES": "Debug"
             }
 
diff --git a/Panzerfaust/Panzerfaust.csproj b/Panzerfaust/Panzerfaust.csproj
@@ -8,7 +8,8 @@
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 		<ApplicationIcon>./Assets/avalonia-logo.ico</ApplicationIcon>
 		<BaseOutputPath Condition="$([MSBuild]::IsOSPlatform('Windows')) == 'true'">..\Result.Windows.x64.MultiConfig</BaseOutputPath>
-		<BaseOutputPath Condition="$([MSBuild]::IsOSPlatform('OSX')) == 'true'">..\Result.Darwin.x64.$(Configuration)</BaseOutputPath>
+        <BaseOutputPath Condition="$([MSBuild]::IsOSPlatform('OSX')) == 'true' AND $(RuntimeIdentifier) == 'osx-arm64'">..\Result.Darwin.arm64.$(Configuration)</BaseOutputPath>
+		<BaseOutputPath Condition="$([MSBuild]::IsOSPlatform('OSX')) == 'true'i AND $(RuntimeIdentifier) == 'osx-x64'"">..\Result.Darwin.x64.$(Configuration)</BaseOutputPath>
 		<BaseOutputPath Condition="$([MSBuild]::IsOSPlatform('Linux')) == 'true'">..\Result.Linux.x64.$(Configuration)</BaseOutputPath>
 		<Platforms>x64;arm64</Platforms>
 	</PropertyGroup>
diff --git a/Tetragrama/CMakeLists.txt b/Tetragrama/CMakeLists.txt
@@ -1,3 +1,14 @@
+cmake_minimum_required (VERSION 3.17)
+
+project (Tetragrama 
+	VERSION 1.0
+	DESCRIPTION "Tetragrama, the ZEngine Editor"
+	LANGUAGES CXX
+)
+
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set	(CMAKE_CXX_STANDARD 20)
+
 file (GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 file (GLOB_RECURSE CPP_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
diff --git a/ZEngine/CMakeLists.txt b/ZEngine/CMakeLists.txt
@@ -6,5 +6,8 @@ project (ZEngine
 	LANGUAGES CXX C
 )
 
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set	(CMAKE_CXX_STANDARD 20)
+
 add_subdirectory (ZEngine)
 add_subdirectory (tests)
diff --git a/ZEngine/ZEngine/Maths/Math.cpp b/ZEngine/ZEngine/Maths/Math.cpp
diff --git a/ZEngine/ZEngine/pch.h b/ZEngine/ZEngine/pch.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <spdlog/sinks/stdout_color_sinks.h>
-#include <uuid.h>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/dependencies.cmake b/dependencies.cmake
@@ -1,10 +1,11 @@
 include(FetchContent)
 
+if(NOT MACOSX_ARCHITECTURE_ARM64)
 set (CMAKE_PREFIX_PATH
 	${CMAKE_PREFIX_PATH}
-    __tools/ShaderCCompiler/lib/cmake
-    __tools/ShaderCCompiler/SPIRV-Tools/cmake
+    __tools/ShaderCCompiler
 	)
+endif()
 
 FetchContent_Declare(
   fmt
@@ -50,13 +51,6 @@ FetchContent_Declare(
   FIND_PACKAGE_ARGS 
   )
 
-FetchContent_Declare(
-  glm
-  GIT_REPOSITORY https://github.com/g-truc/glm.git
-  GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
-  )
-
 FetchContent_Declare(
   EnTT 
   GIT_REPOSITORY https://github.com/skypjack/entt.git
@@ -192,7 +186,6 @@ FetchContent_MakeAvailable(
   stbimage
   glfw3
   spdlog
-  glm
   EnTT
   assimp
   stduuid
@@ -245,8 +238,6 @@ target_link_libraries(imguizmo PUBLIC imgui)
 
 add_library(External_libs INTERFACE)
 
-target_compile_definitions(External_libs INTERFACE GLM_ENABLE_EXPERIMENTAL)
-
 target_include_directories(External_libs
     INTERFACE
                                 ${CMAKE_CURRENT_SOURCE_DIR}
@@ -260,15 +251,13 @@ target_include_directories(External_libs
 target_link_libraries(External_libs
     INTERFACE
          fmt::fmt
-         glm::glm
          imguizmo
          spdlog::spdlog
          EnTT::EnTT
          assimp::assimp
          stduuid
          yaml-cpp::yaml-cpp
          spirv-cross-core
-         SPIRV-Tools
          glslang::glslang
          glslang::glslang-default-resource-limits
          glslang::SPIRV

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,8 @@ project (ZEngine`
`6`	`6`	`LANGUAGES CXX C`
`7`	`7`	`)`
`8`	`8`
	`9`	`+set (CMAKE_CXX_STANDARD_REQUIRED ON)`
	`10`	`+set (CMAKE_CXX_STANDARD 20)`
	`11`	`+`
`9`	`12`	`add_subdirectory (ZEngine)`
`10`	`13`	`add_subdirectory (tests)`