diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-22 14:59:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-22 14:59:57 (GMT) |
| commit | 90f5845e72a1cd485673940f637afef4730de6a9 (patch) | |
| tree | 75dbe6b399dd5ff8c6b0e126ab3af8fcf0c329f5 | |
| parent | cbbe840e96aa588028ef5866f303a468d8da747d (diff) | |
| parent | 844f98c1fd1c9c61f1d73310ee1eb712528cd00f (diff) | |
| download | CMake-90f5845e72a1cd485673940f637afef4730de6a9.zip CMake-90f5845e72a1cd485673940f637afef4730de6a9.tar.gz CMake-90f5845e72a1cd485673940f637afef4730de6a9.tar.bz2 | |
Merge branch 'doc-mingw-makefiles' into release
| -rw-r--r-- | Help/generator/MSYS Makefiles.rst | 10 | ||||
| -rw-r--r-- | Help/generator/MinGW Makefiles.rst | 11 |
2 files changed, 15 insertions, 6 deletions
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. |