diff options
| author | Johnny Jazeix <jazeix@gmail.com> | 2019-11-02 10:25:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-04 17:03:48 (GMT) |
| commit | 82ddcf0db1d220564145122c3cce25d25ee0e254 (patch) | |
| tree | 5529d4876cae56fe6d868df3826b5c866e422a93 /Modules/CMakeMinGWFindMake.cmake | |
| parent | 60e7e5b60540dfbd1e67c415ee399e4aea59a369 (diff) | |
| download | CMake-82ddcf0db1d220564145122c3cce25d25ee0e254.zip CMake-82ddcf0db1d220564145122c3cce25d25ee0e254.tar.gz CMake-82ddcf0db1d220564145122c3cce25d25ee0e254.tar.bz2 | |
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
Diffstat (limited to 'Modules/CMakeMinGWFindMake.cmake')
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index 523f00c..f026e9a 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) |