nlohmann_json and mac-os using Ninja

MathewBensonCode · MathewBensonCode · commit 643f0817b444 · 2025-08-01T10:58:42.000+03:00
diff --git a/Scripts/BuildEngine.ps1 b/Scripts/BuildEngine.ps1
@@ -162,7 +162,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
             $env:CXX = 'g++'
         }
         "Darwin" {
-            $cMakeGenerator = "-G `"Xcode`""
+            $cMakeGenerator = "-G Ninja"
             $cMakeCacheVariableOverride += ' ' + $submoduleCMakeOptions.FRAMEWORK -join ' '
         }
         Default {
diff --git a/__externals/externals.cmake b/__externals/externals.cmake
@@ -46,12 +46,14 @@ add_subdirectory (${EXTERNAL_DIR}/VulkanMemoryAllocator)
 add_subdirectory (${EXTERNAL_DIR}/tlsf)
 add_subdirectory (${EXTERNAL_DIR}/rapidhash)
 add_subdirectory (${EXTERNAL_DIR}/CLI11)
+add_subdirectory (${EXTERNAL_DIR}/nlohmann_json)
 
 add_library (ZEngineLibs INTERFACE)
 add_library(TetragramaLibs INTERFACE)
 
 target_link_libraries(TetragramaLibs INTERFACE
     CLI11::CLI11
+    nlohmann_json::nlohmann_json
 )
 
 target_link_libraries(ZEngineLibs INTERFACE

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {`
`162`	`162`	`$env:CXX = 'g++'`
`163`	`163`	`}`
`164`	`164`	`"Darwin" {`
`165`		- $cMakeGenerator = "-G `"Xcode`""
	`165`	`+ $cMakeGenerator = "-G Ninja"`
`166`	`166`	`$cMakeCacheVariableOverride += ' ' + $submoduleCMakeOptions.FRAMEWORK -join ' '`
`167`	`167`	`}`
`168`	`168`	`Default {`