From 831ee44eb139a98fdea7aaa9fb47c5ac00b2b38b Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Mon, 15 Jan 2024 18:36:46 +0000
Subject: [PATCH] Only use Ninja to build on Windows (#7327)

* Only use Ninja for Windows and Linux

* Use make on Linux for now

* Update ChangeLog
---
 CMakePresets.json | 8 +++++---
 ChangeLog         | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index f576fa3a6c..fffb11f75e 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -5,7 +5,6 @@
       "name": "base",
       "hidden": true,
       "binaryDir": "${sourceDir}/build",
-      "generator": "Ninja",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
@@ -15,6 +14,7 @@
       "name": "windows",
       "displayName": "Windows",
       "inherits": "base",
+      "generator": "Ninja",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "cl.exe",
         "CMAKE_CXX_COMPILER": "cl.exe"
@@ -31,12 +31,14 @@
     {
       "name": "linux",
       "displayName": "Linux",
-      "inherits": "base"
+      "inherits": "base",
+      "generator": "Unix Makefiles"
     },
     {
       "name": "macos",
       "displayName": "macOS",
-      "inherits": "base"
+      "inherits": "base",
+      "generator": "Unix Makefiles"
     }
   ],
   "buildPresets": [
diff --git a/ChangeLog b/ChangeLog
index 619be88345..cba517c1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ Tasks:
 - #7323 Add Linux and macOS CMake presets
 - #7325 Add timeout to all GitHub workflows
 - #7326 Restore lpDesktop assignment in Windows daemon
+- #7327 Only use Ninja to build on Windows
 
 # 1.14.6