diff options
Diffstat (limited to 'Modules/CMakeMinGWFindMake.cmake')
| -rw-r--r-- | Modules/CMakeMinGWFindMake.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Modules/CMakeMinGWFindMake.cmake b/Modules/CMakeMinGWFindMake.cmake index f760d74d4..efba20a31 100644 --- a/Modules/CMakeMinGWFindMake.cmake +++ b/Modules/CMakeMinGWFindMake.cmake @@ -12,13 +12,13 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PROGRAM(CMAKE_MAKE_PROGRAM mingw32-make.exe PATHS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/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 ) -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) +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") + set(CMAKE_MAKE_PROGRAM NOTFOUND) +endif() -MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM CMAKE_SH) +mark_as_advanced(CMAKE_MAKE_PROGRAM CMAKE_SH) |