[Cmake-commits] CMake branch, next, updated. v3.6.0-923-gb0f86b5
Brad King
brad.king at kitware.com
Wed Jul 20 09:19:32 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b0f86b5f5abfb50a4c93ec93e2f9b82ea7e16733 (commit)
via 7ec32a00d74bca7ff1a4873c8133b4811edc7bba (commit)
from abaec3872e181abb8d0757e06d431b6089805c11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0f86b5f5abfb50a4c93ec93e2f9b82ea7e16733
commit b0f86b5f5abfb50a4c93ec93e2f9b82ea7e16733
Merge: abaec38 7ec32a0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 20 09:19:31 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 20 09:19:31 2016 -0400
Merge topic 'bootstrap-msys2' into next
7ec32a00 bootstrap: Add support for MSYS2
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ec32a00d74bca7ff1a4873c8133b4811edc7bba
commit 7ec32a00d74bca7ff1a4873c8133b4811edc7bba
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 20 09:15:36 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 20 09:17:08 2016 -0400
bootstrap: Add support for MSYS2
Bootstrapping under MSYS2 is the same as under MSYS/MinGW except that
`uname` reports `MSYS...` instead of `MINGW...`.
diff --git a/bootstrap b/bootstrap
index 20b64a1..742fa2b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -90,7 +90,7 @@ else
fi
# Determine whether this is a MinGW environment.
-if echo "${cmake_system}" | grep MINGW >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep 'MINGW\|MSYS' >/dev/null 2>&1; then
cmake_system_mingw=true
else
cmake_system_mingw=false
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list