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 5615032515324d017f9181de515b18f2b8ac22dd (commit)
via 267f613f961701bf24bbacf335668d77d5fb06ce (commit)
from 193897f7eda7150a4ae8d4de0dec70f2910f934e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5615032515324d017f9181de515b18f2b8ac22dd
commit 5615032515324d017f9181de515b18f2b8ac22dd
Merge: 193897f 267f613
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Dec 19 09:00:29 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 19 09:00:29 2014 -0500
Merge topic 'doc-mingw-makefiles' into next
267f613f Help: Clarify MinGW v. MSYS Makefiles generators (#15319)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=267f613f961701bf24bbacf335668d77d5fb06ce
commit 267f613f961701bf24bbacf335668d77d5fb06ce
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Dec 19 08:51:17 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Dec 19 09:00:03 2014 -0500
Help: Clarify MinGW v. MSYS Makefiles generators (#15319)
Explain the usage of each generator more clearly and reference each as
an alternative to the other.
Suggested-by: Craig Hicks <hicks...@hotmail.com>
diff --git a/Help/generator/MSYS Makefiles.rst b/Help/generator/MSYS
Makefiles.rst
index 0b89126..f7cfa44 100644
--- a/Help/generator/MSYS Makefiles.rst
+++ b/Help/generator/MSYS Makefiles.rst
@@ -1,7 +1,11 @@
MSYS Makefiles
--------------
-Generates MSYS makefiles.
+Generates makefiles for use with MSYS ``make`` under the MSYS shell.
-The makefiles use /bin/sh as the shell. They require msys to be
-installed on the machine.
+Use this generator in a MSYS shell prompt and using ``make`` as the build
+tool. The generated makefiles use ``/bin/sh`` as the shell to launch build
+rules. They are not compatible with a Windows command prompt.
+
+To build under a Windows command prompt, use the
+:generator:`MinGW Makefiles` generator.
diff --git a/Help/generator/MinGW Makefiles.rst b/Help/generator/MinGW
Makefiles.rst
index ed4ccdd..9fe5fe3 100644
--- a/Help/generator/MinGW Makefiles.rst
+++ b/Help/generator/MinGW Makefiles.rst
@@ -1,7 +1,12 @@
MinGW Makefiles
---------------
-Generates a make file for use with mingw32-make.
+Generates makefiles for use with ``mingw32-make`` under a Windows command
+prompt.
-The makefiles generated use cmd.exe as the shell. They do not require
-msys or a unix shell.
+Use this generator under a Windows command prompt with MinGW in the ``PATH``
+and using ``mingw32-make`` as the build tool. The generated makefiles use
+``cmd.exe`` as the shell to launch build rules. They are not compatible with
+MSYS or a unix shell.
+
+To build under the MSYS shell, use the :generator:`MSYS Makefiles` generator.
-----------------------------------------------------------------------
Summary of changes:
Help/generator/MSYS Makefiles.rst | 10 +++++++---
Help/generator/MinGW Makefiles.rst | 11 ++++++++---
2 files changed, 15 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
