diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-22 13:48:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-22 13:48:17 (GMT) |
| commit | f53ce89d6a309f5f44630c9a9ef12d7440828cd0 (patch) | |
| tree | 6b2b3385ca54087839f9a8e69530a761a438a8d0 | |
| parent | 7dcf63e8a5c3c764b7d99162f508e228d212d034 (diff) | |
| parent | 9cdc5e6bc74546b16e3ffc8e8411ce207d4e70f1 (diff) | |
| download | CMake-f53ce89d6a309f5f44630c9a9ef12d7440828cd0.zip CMake-f53ce89d6a309f5f44630c9a9ef12d7440828cd0.tar.gz CMake-f53ce89d6a309f5f44630c9a9ef12d7440828cd0.tar.bz2 | |
Merge topic 'mingw-in-codeblocks'
9cdc5e6 MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)
| -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") |