diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-05 16:32:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-05 16:32:58 (GMT) |
| commit | 370fe1495b4109430b2cb250dd3afd1ce9401cf6 (patch) | |
| tree | 3816c48ec4a445c94d0f4f6f1d6042da102064db | |
| parent | 32a483187a77532da55e67a2121ff29a39e4c421 (diff) | |
| parent | 82ddcf0db1d220564145122c3cce25d25ee0e254 (diff) | |
| download | CMake-370fe1495b4109430b2cb250dd3afd1ce9401cf6.zip CMake-370fe1495b4109430b2cb250dd3afd1ce9401cf6.tar.gz CMake-370fe1495b4109430b2cb250dd3afd1ce9401cf6.tar.bz2 | |
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@kitware.com>
Merge-request: !3978
| -rw-r--r-- | Help/release/dev/mingw_no_sh.rst | 5 | ||||
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Help/release/dev/mingw_no_sh.rst b/Help/release/dev/mingw_no_sh.rst new file mode 100644 index 0000000..7008865 --- /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 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) |