diff options
| author | Ziemowit Łąski <15880281+zlaski@users.noreply.github.com> | 2022-11-29 22:27:57 -0800 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-30 08:48:29 -0500 |
| commit | 903ae3c71b0c48b882e7d9772391fc6bf13adabf (patch) | |
| tree | 44834fb0551c4d1ecd29efadcb957623bbfce234 /Modules/CMakeMSYSFindMake.cmake | |
| parent | 2057066e058156c7762ef14e508f148f97cdac44 (diff) | |
| download | cmake-903ae3c71b0c48b882e7d9772391fc6bf13adabf.tar.gz | |
MSYS Makefiles: Modernize search paths for common MSYS 'make' locations
Diffstat (limited to 'Modules/CMakeMSYSFindMake.cmake')
| -rw-r--r-- | Modules/CMakeMSYSFindMake.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/CMakeMSYSFindMake.cmake b/Modules/CMakeMSYSFindMake.cmake index 33b02c9785..96fdb37707 100644 --- a/Modules/CMakeMSYSFindMake.cmake +++ b/Modules/CMakeMSYSFindMake.cmake @@ -3,8 +3,13 @@ find_program(CMAKE_MAKE_PROGRAM make + REGISTRY_VIEW 32 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) + # Typical install path for 32-bit MSYS2 (https://repo.msys2.org/distrib/msys2-i686-latest.sfx.exe) + "C:/msys32/usr" + # Typical install path for MINGW32 (https://sourceforge.net/projects/mingw) + "C:/mingw/msys" + # Git for Windows 32-bit (https://gitforwindows.org/) + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GitForWindows;InstallPath]/usr") + mark_as_advanced(CMAKE_MAKE_PROGRAM) |