CI: Adjust presets for new M1 runner

macos-latest now maps to macos-14, which is an M1 mac.
Adjust the aarch64 file to not enable CMake cross-compiling mode,
and add a toolchain file for x86_64 apple.

.github/scripts/toolchains/aarch64-apple-darwin-clang.cmake

@@ -2,6 +2,4 @@ set(CMAKE_C_COMPILER "clang")
 set(CMAKE_CXX_COMPILER "clang++")
 set(CMAKE_C_COMPILER_TARGET "aarch64-apple-darwin")
 set(CMAKE_CXX_COMPILER_TARGET "aarch64-apple-darwin")
-set(CMAKE_SYSTEM_NAME "Darwin")
-set(CMAKE_SYSTEM_VERSION ${CMAKE_HOST_SYSTEM_VERSION})
 set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")

.github/scripts/toolchains/x86_64-apple-darwin-clang.cmake

@@ -0,0 +1,7 @@
+set(CMAKE_C_COMPILER "clang")
+set(CMAKE_CXX_COMPILER "clang++")
+set(CMAKE_C_COMPILER_TARGET "x86_64-apple-darwin")
+set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-darwin")
+set(CMAKE_SYSTEM_NAME "Darwin")
+set(CMAKE_SYSTEM_VERSION ${CMAKE_HOST_SYSTEM_VERSION})
+set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "")

CMakePresets.json

@@ -304,7 +304,8 @@
         },
         {
             "name": "x86_64-apple-darwin-clang",
-            "inherits": ["x86_64-apple-darwin", "clang"]
+            "inherits": ["x86_64-apple-darwin", "clang"],
+            "toolchainFile": "${sourceDir}/.github/scripts/toolchains/${presetName}.cmake"
         },
         {
             "name": "aarch64-apple-darwin-clang",