summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2019-02-19 12:55:59 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-02-19 12:56:06 (GMT)
commit9cab31cc79b9c19f2a5121a392a3498d06e25723 (patch)
tree1f17e70149804bdd663c4ac8e0a47fcf2009fd2f
parent2dd2079152ceda32a7e5f330f7182fd658716c41 (diff)
parent55ad9304ed87f365e69b5dc01d5b07d25aecc9e2 (diff)
downloadCMake-9cab31cc79b9c19f2a5121a392a3498d06e25723.zip
CMake-9cab31cc79b9c19f2a5121a392a3498d06e25723.tar.gz
CMake-9cab31cc79b9c19f2a5121a392a3498d06e25723.tar.bz2
Merge topic 'readme-msys2'
55ad9304ed README: Explain how to bootstrap via MSYS2 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bartosz <gang65@poczta.onet.pl> Merge-request: !2983
-rw-r--r--README.rst19
1 files changed, 16 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 775463e..11bafca 100644
--- a/README.rst
+++ b/README.rst
@@ -67,11 +67,24 @@ choice. Once this has finished successfully, run ``make`` and
Windows
^^^^^^^
-You need to download and install a binary release of CMake in order to build
-CMake. You can get these releases from the `CMake Download Page`_. Then
-proceed with the instructions below.
+There are two ways for building CMake under Windows:
+
+1. Compile with MSVC from VS 2015 or later.
+ You need to download and install a binary release of CMake. You can get
+ these releases from the `CMake Download Page`_. Then proceed with the
+ instructions below for `Building CMake with CMake`_.
+
+2. Bootstrap with MinGW under MSYS2.
+ Download and install `MSYS2`_. Then install the required build tools::
+
+ $ pacman -S --needed git base-devel mingw-w64-x86_64-gcc
+
+ and bootstrap as above::
+
+ $ ./bootstrap && make
.. _`CMake Download Page`: https://cmake.org/cmake/resources/software.html
+.. _`MSYS2`: https://www.msys2.org/
Building CMake with CMake
-------------------------