https://github.com/Kitware/CMake
Revision b87645b6a57b3c37b28b74f93f6b189079eb67aa authored by Brad King on 18 August 2022, 13:41:08 UTC, committed by Brad King on 19 August 2022, 11:30:54 UTC
Restore the change from commit 6f17996edc (gitlab-ci: Update Windows
builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for
packaging jobs.  `cmake-gui` is still buggy when compiled with
the newer toolset.

Issue: #23859
1 parent cb8b27a
Raw File
Tip revision: b87645b6a57b3c37b28b74f93f6b189079eb67aa authored by Brad King on 18 August 2022, 13:41:08 UTC
gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
Tip revision: b87645b
CMakeMSYSFindMake.cmake
# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.


find_program(CMAKE_MAKE_PROGRAM make
  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)
mark_as_advanced(CMAKE_MAKE_PROGRAM)
back to top