mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-14 02:59:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-win11-sdk' into release-4.2

Browse Source 
6d8ce8b190 VS: Accept Windows 11 SDKs as semantically equivalent to Windows 10 SDKs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11671
This commit is contained in:
Brad King
2026-02-11 16:52:40 +00:00
committed by Kitware Robot
parent c940e270e6 6d8ce8b190
commit 57346991aa
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmVSSetupHelper.cxx
View File

@@ -54,6 +54,8 @@ const CLSID CLSID_SetupConfiguration = {
#endif
namespace {
const WCHAR* Win11SDKComponent =
L"Microsoft.VisualStudio.Component.Windows11SDK";
const WCHAR* Win10SDKComponent =
L"Microsoft.VisualStudio.Component.Windows10SDK";
const WCHAR* Win81SDKComponent =
@@ -156,10 +158,9 @@ bool cmVSSetupAPIHelper::CheckInstalledComponent(
std::wstring id = std::wstring(bstrId);
std::wstring type = std::wstring(bstrType);
// Checks for any version of Win10 SDK. The version is appended at the end of
// the
// component name ex: Microsoft.VisualStudio.Component.Windows10SDK.10240
if (id.find(Win10SDKComponent) != std::wstring::npos &&
// Check for any version of Win10 or Win11 SDK.
// The component name may have a `.<version>` suffix. Accept any.
if ((id.find(Win11SDKComponent) == 0 || id.find(Win10SDKComponent) == 0) &&
type == ComponentType) {
bWin10SDK = true;
ret = true;
@@ -526,25 +527,25 @@ int cmVSSetupAPIHelper::ChooseVSInstance(
unsigned int chosenIndex = 0;
for (unsigned int i = 1; i < vecVSInstances.size(); i++) {
// If the current has Win10 SDK but not the chosen one, then choose the
// current VS instance
// If the current instance has Win10 SDK, but the chosen one does not,
// then choose the current VS instance.
if (!vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
vecVSInstances[i].IsWin10SDKInstalled) {
chosenIndex = i;
continue;
}
// If the chosen one has Win10 SDK but the current one is not, then look at
// the next VS instance even the current
// instance version may be higher
// If the chosen instance has Win10 SDK, but the current one does not,
// then look at the next VS instance even if the current instance version
// may be higher.
if (vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
!vecVSInstances[i].IsWin10SDKInstalled) {
continue;
}
// If both chosen one and current one doesn't have Win10 SDK but the
// current one has Win8.1 SDK installed,
// then choose the current one
// If both chosen instance and current instance do not have Win10 SDK,
// but the current one has Win8.1 SDK installed, then choose the current
// one.
if (!vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
!vecVSInstances[i].IsWin10SDKInstalled &&
!vecVSInstances[chosenIndex].IsWin81SDKInstalled &&