diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-16 02:26:47 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-16 02:26:47 (GMT) |
| commit | 5042581f4384cbeb19b769e8443ff4da7d322790 (patch) | |
| tree | 6029afb540fb8c1cf0e2ac370dbac18586d7f369 /Modules | |
| parent | 5288d61ede70fbe0944b1eff22eff11ae4f10a1a (diff) | |
| download | CMake-5042581f4384cbeb19b769e8443ff4da7d322790.zip CMake-5042581f4384cbeb19b769e8443ff4da7d322790.tar.gz CMake-5042581f4384cbeb19b769e8443ff4da7d322790.tar.bz2 | |
ENH: better algorithm for looking for make and gcc on msys and mingw
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeMSYSFindMake.cmake | 6 | ||||
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Modules/CMakeMSYSFindMake.cmake b/Modules/CMakeMSYSFindMake.cmake index 83bd111..5a9a342 100644 --- a/Modules/CMakeMSYSFindMake.cmake +++ b/Modules/CMakeMSYSFindMake.cmake @@ -1,2 +1,6 @@ -FIND_PROGRAM(CMAKE_MAKE_PROGRAM make PATHS c:/msys/1.0/bin /msys/1.0/bin) +FIND_PROGRAM(CMAKE_MAKE_PROGRAM make + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MSYS-1.0_is1;Inno Setup: App Path]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin" + c:/msys/1.0/bin /msys/1.0/bin) MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index 42d1624..2ad0298 100644 --- a/Modules/CMakeMinGWFindMake.cmake +++ b/Modules/CMakeMinGWFindMake.cmake @@ -1,8 +1,10 @@ -FIND_PROGRAM(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS c:/MinGW/bin /MinGW/bin) +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) FIND_PROGRAM(CMAKE_SH sh.exe ) -MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM 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") SET(CMAKE_MAKE_PROGRAM NOTFOUND) ENDIF(CMAKE_SH) +MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM CMAKE_SH) |