mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-07 07:08:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'msys-pkgconf'

Browse Source 
903ae3c71b MSYS Makefiles: Modernize search paths for common MSYS 'make' locations
2057066e05 FindMsys: Modernize search paths for common MSYS locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7955
This commit is contained in:
Brad King
2022-12-01 13:00:14 +00:00
committed by Kitware Robot
parent 907402b147 903ae3c71b
commit c44bae98cd
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/CMakeMSYSFindMake.cmake
View File

@@ -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)

9
Modules/FindMsys.cmake
View File

@@ -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)