From 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1 Mon Sep 17 00:00:00 2001 From: Jason Spiro Date: Fri, 19 Jul 2013 07:04:00 -0400 Subject: [PATCH] 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 --- Modules/CMakeMinGWFindMake.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index efba20a31..d7298dcef 100644 --- a/Modules/CMakeMinGWFindMake.cmake +++ b/Modules/CMakeMinGWFindMake.cmake @@ -14,7 +14,9 @@ find_program(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS "[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 ) 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")