From 2057066e058156c7762ef14e508f148f97cdac44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ziemowit=20=C5=81=C4=85ski?=
 <15880281+zlaski@users.noreply.github.com>
Date: Sat, 26 Nov 2022 23:47:27 -0800
Subject: FindMsys: Modernize search paths for common MSYS locations

---
 Modules/FindMsys.cmake | 9 +++++----
 1 file 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)
-- 
cgit v0.12


From 903ae3c71b0c48b882e7d9772391fc6bf13adabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ziemowit=20=C5=81=C4=85ski?=
 <15880281+zlaski@users.noreply.github.com>
Date: Tue, 29 Nov 2022 22:27:57 -0800
Subject: MSYS Makefiles: Modernize search paths for common MSYS 'make'
 locations

---
 Modules/CMakeMSYSFindMake.cmake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Modules/CMakeMSYSFindMake.cmake b/Modules/CMakeMSYSFindMake.cmake
index 33b02c9..96fdb37 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)
-- 
cgit v0.12