From 3126dbfe12b967d8474c8177bb2dce14a5340849 Mon Sep 17 00:00:00 2001
From: halprin <halprin@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:42:26 -0700
Subject: [PATCH] Set the multiple architectures as part of the CMake presets
 instead of the CmakeLists file

---
 CMakeLists.txt    | 1 -
 CMakePresets.json | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 500f4c0b..abe92825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   message("Building for MAC OSX")
   add_compile_definitions(POSIX MACOSX=1 _USE_OGL_ACTIVE_TEXTURES PRIMARY_HOG=\"d3-osx.hog\")
   set(PLATFORM_INCLUDES "lib/linux" ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
-  set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # Windows.h defines to avoid as many issues as possible.
   add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX NODRAWTEXT NOBITMAP NOMCX NOSERVICE PRIMARY_HOG=\"d3-win.hog\"
diff --git a/CMakePresets.json b/CMakePresets.json
index 50eda7ea..67137102 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -31,6 +31,11 @@
 				"type": "equals",
 				"lhs": "${hostSystemName}",
 				"rhs": "Darwin"
+			},
+			"cacheVariables": {
+				"VCPKG_TARGET_TRIPLET": "universal-osx",
+				"CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",
+				"VCPKG_OSX_ARCHITECTURES": "arm64;x86_64"
 			}
 		},
 		{