cmake: default to ninja

This commit is contained in:
Christoph Reiter
2021-07-19 20:44:41 +02:00
parent fdcf9ddf7f
commit 9014e4454f
2 changed files with 23 additions and 3 deletions

View File

@@ -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

View File

@@ -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() {