MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
If one installs MinGW using the Code::Blocks IDE installer it goes to a path like "c:\Program Files\CodeBlocks\MinGW", not "c:\MinGW". Use the CodeBlocks registry entry to get the location. Signed-off-by: Jason Spiro <jasonspiro4@gmail.com>
This commit is contained in:
parent
e3c9be07b2
commit
9cdc5e6bc7
|
@ -14,7 +14,9 @@
|
||||||
|
|
||||||
find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
|
find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin"
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin"
|
||||||
c:/MinGW/bin /MinGW/bin)
|
c:/MinGW/bin /MinGW/bin
|
||||||
|
"[HKEY_CURRENT_USER\\Software\\CodeBlocks;Path]/MinGW/bin"
|
||||||
|
)
|
||||||
find_program(CMAKE_SH sh.exe )
|
find_program(CMAKE_SH sh.exe )
|
||||||
if(CMAKE_SH)
|
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")
|
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")
|
||||||
|
|
Loading…
Reference in New Issue