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, master has been updated
via 370fe1495b4109430b2cb250dd3afd1ce9401cf6 (commit)
via 32a483187a77532da55e67a2121ff29a39e4c421 (commit)
via 3c0a317a1d111fb1012de45c39b81048f5a700d9 (commit)
via 0ec60a400234624b258307a7944184828c8b6abc (commit)
via 408a3a7d5e21d6b49af5d9b3b7e59f3286cd32b7 (commit)
via 602189bb7b5f62a28e101cf0ed51572d2bf92f2f (commit)
via 2d83709038a40fd15abba23812150e78da963960 (commit)
via 82ddcf0db1d220564145122c3cce25d25ee0e254 (commit)
from cb165b8b79c96a3ff6db12cb1821cfa2c0c4cce5 (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=370fe1495b4109430b2cb250dd3afd1ce9401cf6
commit 370fe1495b4109430b2cb250dd3afd1ce9401cf6
Merge: 32a483187a 82ddcf0db1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 16:32:47 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 5 11:32:58 2019 -0500
Merge topic 'remove_sh_error_mingw'
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3978
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32a483187a77532da55e67a2121ff29a39e4c421
commit 32a483187a77532da55e67a2121ff29a39e4c421
Merge: cb165b8b79 3c0a317a1d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 11:32:00 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 11:32:00 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82ddcf0db1d220564145122c3cce25d25ee0e254
commit 82ddcf0db1d220564145122c3cce25d25ee0e254
Author: Johnny Jazeix <jazeix at gmail.com>
AuthorDate: Sat Nov 2 11:25:01 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 12:03:48 2019 -0500
MinGW Makefiles: do not fail if sh.exe is present in the path
The check was added only to fail early in an environment known not to work
at the time:
* https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html
Fixes: #19327
diff --git a/Help/release/dev/mingw_no_sh.rst b/Help/release/dev/mingw_no_sh.rst
new file mode 100644
index 0000000000..700886585b
--- /dev/null
+++ b/Help/release/dev/mingw_no_sh.rst
@@ -0,0 +1,5 @@
+mingw-no-sh
+-----------
+
+* The :generator:`MinGW Makefiles` generator no longer issues an error if
+ ``sh.exe`` is present in the environment's ``PATH``.
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake
index 523f00c3a3..f026e9aa7c 100644
--- a/Modules/CMakeMinGWFindMake.cmake
+++ b/Modules/CMakeMinGWFindMake.cmake
@@ -7,10 +7,5 @@ find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
c:/MinGW/bin /MinGW/bin
"[HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin"
)
-find_program(CMAKE_SH sh.exe )
-if(CMAKE_SH)
- message(FATAL_ERROR "sh.exe was found in your PATH, here:\n${CMAKE_SH}\nFor MinGW make to work correctly sh.exe must NOT be in your path.\nRun cmake from a shell that does not have sh.exe in your PATH.\nIf you want to use a UNIX shell, then use MSYS Makefiles.\n")
- set(CMAKE_MAKE_PROGRAM NOTFOUND)
-endif()
-mark_as_advanced(CMAKE_MAKE_PROGRAM CMAKE_SH)
+mark_as_advanced(CMAKE_MAKE_PROGRAM)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/mingw_no_sh.rst | 5 +++++
Modules/CMakeMinGWFindMake.cmake | 7 +------
2 files changed, 6 insertions(+), 6 deletions(-)
create mode 100644 Help/release/dev/mingw_no_sh.rst
hooks/post-receive
--
CMake