diff options
| author | Jason Spiro <jasonspiro4@gmail.com> | 2013-07-19 11:04:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-19 11:56:37 (GMT) |
| commit | 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1 (patch) | |
| tree | 7da20db533256cf512412f368433425104e99c8a /Modules/CMakeMinGWFindMake.cmake | |
| parent | e3c9be07b25efd06bf38bcd1a740f8bfe7cfb24c (diff) | |
| download | CMake-9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1.zip CMake-9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1.tar.gz CMake-9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1.tar.bz2 | |
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>
Diffstat (limited to 'Modules/CMakeMinGWFindMake.cmake')
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index efba20a..d7298dc 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") |