From 9014e4454f84165efe55bcf4ffdf1db647cfa75a Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 19 Jul 2021 20:44:41 +0200
Subject: [PATCH] cmake: default to ninja

---
 .../0005-Default-to-ninja-generator.patch          | 14 ++++++++++++++
 mingw-w64-cmake/PKGBUILD                           | 12 +++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-cmake/0005-Default-to-ninja-generator.patch

diff --git a/mingw-w64-cmake/0005-Default-to-ninja-generator.patch b/mingw-w64-cmake/0005-Default-to-ninja-generator.patch
new file mode 100644
index 0000000000..c7e85d3b66
--- /dev/null
+++ b/mingw-w64-cmake/0005-Default-to-ninja-generator.patch
@@ -0,0 +1,14 @@
+--- cmake-3.21.0/Source/cmake.cxx.orig	2021-07-19 20:15:00.027000000 +0200
++++ cmake-3.21.0/Source/cmake.cxx	2021-07-19 20:16:17.719000700 +0200
+@@ -2179,7 +2179,10 @@
+       return gen;
+     }
+   }
+-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW)
++#if defined(_WIN32) && defined(__MINGW32__) && !defined(CMAKE_BOOT_MINGW)
++  return std::unique_ptr<cmGlobalGenerator>(
++    cm::make_unique<cmGlobalNinjaGenerator>(this));
++#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW)
+   std::string found;
+   // Try to find the newest VS installed on the computer and
+   // use that as a default if -G is not specified
diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD
index e9d563fdd8..66f147410e 100644
--- a/mingw-w64-cmake/PKGBUILD
+++ b/mingw-w64-cmake/PKGBUILD
@@ -5,7 +5,7 @@ _realname=cmake
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.21.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open-source make system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -39,13 +39,15 @@ source=("https://github.com/Kitware/CMake/releases/download/v${pkgver}/${_realna
         "0002-Do-not-install-Qt-bundle-in-cmake-gui.patch"
         "0004-Output-line-numbers-in-callstacks.patch"
         "35d3e00e4e9b138dec1d1a646766fc342d04b8f5.patch"
-        "f90d15458a9a98180fcc95158f2ab5d2b1ad3152.patch")
+        "f90d15458a9a98180fcc95158f2ab5d2b1ad3152.patch"
+        "0005-Default-to-ninja-generator.patch")
 sha256sums=('4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab'
             '25793edcbac05bb6d17fa9947b52ace4a6b5ccccf7758e22ae9ae022ed089061'
             'f6cf6a6f2729db2b9427679acd09520af2cd79fc26900b19a49cead05a55cd1a'
             '15fdf3fb1a0f1c153c8cfbdd2b5c64035b7a04de618bfe61d7d74ced0d6a5c4b'
             'c4c120046860c014e0da4be959decf330ad8dcdae5a48ebcb8ec59006eb0e625'
-            'e0dbe6da13372f9817d6451a7d75c5fd9cdf5843a305e80d8803ad76d04434a4')
+            'e0dbe6da13372f9817d6451a7d75c5fd9cdf5843a305e80d8803ad76d04434a4'
+            '426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2')
 
 
 # Helper macros to help make tasks easier #
@@ -76,6 +78,10 @@ prepare() {
     0004-Output-line-numbers-in-callstacks.patch \
     35d3e00e4e9b138dec1d1a646766fc342d04b8f5.patch \
     f90d15458a9a98180fcc95158f2ab5d2b1ad3152.patch
+
+  # We want cmake to default to something useful and not MSVC
+  apply_patch_with_msg \
+    0005-Default-to-ninja-generator.patch
 }
 
 build() {