mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'remove_sh_error_mingw'

Browse Source 
82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3978
This commit is contained in:
Brad King
2019-11-05 16:32:47 +00:00
committed by Kitware Robot
parent 32a483187a 82ddcf0db1
commit 370fe1495b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Help/release/dev/mingw_no_sh.rst
+5
View File
@@ -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``.
Modules/CMakeMinGWFindMake.cmake
+1 -6
View File
@@ -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)