diff options
| author | Ziemowit Łąski <15880281+zlaski@users.noreply.github.com> | 2022-11-27 07:47:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-30 13:48:14 (GMT) |
| commit | 2057066e058156c7762ef14e508f148f97cdac44 (patch) | |
| tree | da4dd99237a607685d0dbfc9f6c94bcaa83c529a /Modules | |
| parent | 00630bbac783152a7e22bcbbc86c70ab16dca28c (diff) | |
| download | CMake-2057066e058156c7762ef14e508f148f97cdac44.zip CMake-2057066e058156c7762ef14e508f148f97cdac44.tar.gz CMake-2057066e058156c7762ef14e508f148f97cdac44.tar.bz2 | |
FindMsys: Modernize search paths for common MSYS locations
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMsys.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindMsys.cmake b/Modules/FindMsys.cmake index b4796d2..86597c2 100644 --- a/Modules/FindMsys.cmake +++ b/Modules/FindMsys.cmake @@ -19,11 +19,12 @@ if (WIN32) find_program(MSYS_CMD NAMES msys2_shell.cmd PATHS - "C:/msys64" + # Typical install path for MSYS2 (https://repo.msys2.org/distrib/msys2-i686-latest.sfx.exe) "C:/msys32" - "C:/MSYS" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MSYS\\setup;rootdir]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\MSYS\\mounts v2\\/;native]" + # Typical install path for MSYS2 (https://repo.msys2.org/distrib/msys2-x86_64-latest.sfx.exe) + "C:/msys64" + # Git for Windows (https://gitforwindows.org/) + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GitForWindows;InstallPath]" ) get_filename_component(MSYS_INSTALL_PATH "${MSYS_CMD}" DIRECTORY) mark_as_advanced(MSYS_CMD) |