Skip to content

Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file

Brad King requested to merge brad.king/cmake:vs-instance into master

Revert the FindMakeProgram ordering changes from !4898 (merged) and !5529 (merged). We must delay selecting the location of MSBuild until after an instance of Visual Studio has been selected.

Preserve the original use case (sysroot detection in Platform/Android-Determine) by adding and using a new undocumented cmake_host_system_information query to get the location of MSBuild under a VS generator even before FindMakeProgram has executed.

Fixes: #22782 (closed)
Backport: release

Merge request reports