mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-22 23:19:58 -06:00
VS: Make CMAKE_GENERATOR_INSTANCE usable without VS Installer
On Windows and Wine, both the COM interface and `vswhere` might not be
available. `CMAKE_GENERATOR_INSTANCE` is still supposed to work since
commit 195d47e213 (VS: Allow CMAKE_GENERATOR_INSTANCE to specify
portable instance, 2021-10-21, v3.23.0-rc1~452^2).
Issue: #21639
This commit is contained in:
@@ -450,7 +450,8 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
|
||||
|
||||
// Enumerate VS instances with either COM interface or Vswhere
|
||||
if (!EnumerateVSInstancesWithCOM(vecVSInstancesAll) &&
|
||||
!EnumerateVSInstancesWithVswhere(vecVSInstancesAll)) {
|
||||
!EnumerateVSInstancesWithVswhere(vecVSInstancesAll) &&
|
||||
this->SpecifiedVSInstallLocation.empty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user