From d5e33372c95c27ff4d71176ffc0d603eadba148b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6hnenkamp?= <cvk5@me.com>
Date: Fri, 6 Oct 2023 20:25:03 +0200
Subject: [PATCH 1/4] Add Apple M1 preset

---
 CMakePresets.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/CMakePresets.json b/CMakePresets.json
index 3b0a6d9a837..39528da6983 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -78,6 +78,20 @@
         "CMAKE_CXX_COMPILER": "clang++"
       }
     },
+    {
+      "name": "apple-m1-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "architecture": {
+          "value": "arm64",
+          "strategy": "external"
+      },
+      "condition": {
+          "type": "equals",
+          "lhs": "${hostSystemName}",
+          "rhs": "Darwin"
+      }
+    },
     {
       "name": "ninja",
       "hidden": true,
@@ -327,6 +341,23 @@
         "QL_COMPILE_WARNING_AS_ERROR": "ON",
         "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
       }
+    },
+    {
+      "name": "apple-m1-ninja-debug",
+      "description": "Apple M1 preset",
+      "inherits": [
+          "apple-m1-base",
+          "ninja",
+          "_debug"
+      ],
+      "cacheVariables": {
+        "BUILD_SHARED_LIBS": false,
+        "QL_BUILD_EXAMPLES": false,
+        "QL_BUILD_TEST_SUITE": true,
+        "QL_BUILD_BENCHMARK": false,
+        "QL_ENABLE_SESSIONS": true,
+        "QL_USE_STD_SHARED_PTR": "ON"
+      }
     }
   ]
 }

From 1a215aa1872cb611e218dee04e9b33628d1d7b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6hnenkamp?= <cvk5@me.com>
Date: Sat, 7 Oct 2023 11:16:30 +0200
Subject: [PATCH 2/4] Tests build by default

---
 CMakePresets.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 39528da6983..5ed47433850 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -353,7 +353,6 @@
       "cacheVariables": {
         "BUILD_SHARED_LIBS": false,
         "QL_BUILD_EXAMPLES": false,
-        "QL_BUILD_TEST_SUITE": true,
         "QL_BUILD_BENCHMARK": false,
         "QL_ENABLE_SESSIONS": true,
         "QL_USE_STD_SHARED_PTR": "ON"

From b8b45927aed31b2145cdf7f96d7c50d547acdf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6hnenkamp?= <cvk5@me.com>
Date: Mon, 9 Oct 2023 09:49:49 +0200
Subject: [PATCH 3/4] Adding release and relWithDebInfo

---
 CMakePresets.json | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 5ed47433850..8a3b7287eea 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -349,14 +349,25 @@
           "apple-m1-base",
           "ninja",
           "_debug"
-      ],
-      "cacheVariables": {
-        "BUILD_SHARED_LIBS": false,
-        "QL_BUILD_EXAMPLES": false,
-        "QL_BUILD_BENCHMARK": false,
-        "QL_ENABLE_SESSIONS": true,
-        "QL_USE_STD_SHARED_PTR": "ON"
-      }
+      ]
+    },
+    {
+      "name": "apple-m1-ninja-release",
+      "description": "Apple M1 preset",
+      "inherits": [
+          "apple-m1-base",
+          "ninja",
+          "_release"
+      ]
+    },
+    {
+      "name": "apple-m1-ninja-relwithdebinfo",
+      "description": "Apple M1 preset",
+      "inherits": [
+          "apple-m1-base",
+          "ninja",
+          "_relwithdebinfo"
+      ]
     }
   ]
 }

From 20eb0e1feec6db5645d0588e369a7cb1c3565e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6hnenkamp?= <cvk5@me.com>
Date: Mon, 9 Oct 2023 10:22:06 +0200
Subject: [PATCH 4/4] Fix naming of M series family to arm64

---
 CMakePresets.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 8a3b7287eea..189ba7abbeb 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -79,7 +79,7 @@
       }
     },
     {
-      "name": "apple-m1-base",
+      "name": "apple-arm64-base",
       "hidden": true,
       "binaryDir": "${sourceDir}/build/${presetName}",
       "architecture": {
@@ -343,28 +343,28 @@
       }
     },
     {
-      "name": "apple-m1-ninja-debug",
-      "description": "Apple M1 preset",
+      "name": "apple-arm64-ninja-debug",
+      "description": "Apple M series preset Debug",
       "inherits": [
-          "apple-m1-base",
+          "apple-arm64-base",
           "ninja",
           "_debug"
       ]
     },
     {
-      "name": "apple-m1-ninja-release",
-      "description": "Apple M1 preset",
+      "name": "apple-arm64-ninja-release",
+      "description": "Apple M series preset Release",
       "inherits": [
-          "apple-m1-base",
+          "apple-arm64-base",
           "ninja",
           "_release"
       ]
     },
     {
-      "name": "apple-m1-ninja-relwithdebinfo",
-      "description": "Apple M1 preset",
+      "name": "apple-arm64-ninja-relwithdebinfo",
+      "description": "Apple M series preset RelWithDebInfo",
       "inherits": [
-          "apple-m1-base",
+          "apple-arm64-base",
           "ninja",
           "_relwithdebinfo"
       ]