mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 03:50:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmVSSetupHelper: Drop unused ullVersion field

Browse Source 
The field has not been used since commit 3fd65f5ca6 (VS: Compare VS
instance versions as strings, 2021-06-17, v3.21.0-rc1~11^2~1).
This commit is contained in:
Brad King
2021-10-20 13:47:16 -04:00
parent 152f9978dd
commit 3213e2595d
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmVSSetupHelper.cxx
View File

@@ -164,17 +164,11 @@ bool cmVSSetupAPIHelper::GetVSInstanceInfo(
return false; return false;
} }
ULONGLONG ullVersion = 0;
SmartBSTR bstrVersion; SmartBSTR bstrVersion;
if (FAILED(pInstance->GetInstallationVersion(&bstrVersion))) { if (FAILED(pInstance->GetInstallationVersion(&bstrVersion))) {
return false; return false;
} else { } else {
vsInstanceInfo.Version = std::wstring(bstrVersion); vsInstanceInfo.Version = std::wstring(bstrVersion);
if (FAILED(setupHelper->ParseVersion(bstrVersion, &ullVersion))) {
vsInstanceInfo.ullVersion = 0;
} else {
vsInstanceInfo.ullVersion = ullVersion;
}
} }
// Reboot may have been required before the installation path was created. // Reboot may have been required before the installation path was created.
@@ -316,7 +310,6 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
chosenInstanceInfo.Version = chosenInstanceInfo.Version =
std::wstring(envVSVersion.begin(), envVSVersion.end()); std::wstring(envVSVersion.begin(), envVSVersion.end());
chosenInstanceInfo.VCToolsetVersion = envVSVersion; chosenInstanceInfo.VCToolsetVersion = envVSVersion;
chosenInstanceInfo.ullVersion = std::stoi(envVSVersion);
chosenInstanceInfo.IsWin10SDKInstalled = true; chosenInstanceInfo.IsWin10SDKInstalled = true;
chosenInstanceInfo.IsWin81SDKInstalled = !envWindowsSdkDir81.empty(); chosenInstanceInfo.IsWin81SDKInstalled = !envWindowsSdkDir81.empty();
return true; return true;

1
Source/cmVSSetupHelper.h
View File

@@ -88,7 +88,6 @@ struct VSInstanceInfo
std::wstring VSInstallLocation; std::wstring VSInstallLocation;
std::wstring Version; std::wstring Version;
std::string VCToolsetVersion; std::string VCToolsetVersion;
ULONGLONG ullVersion = 0; // A.B.C.D = (A<<48)|(B<<32)|(C<<16)|D
bool IsWin10SDKInstalled = false; bool IsWin10SDKInstalled = false;
bool IsWin81SDKInstalled = false; bool IsWin81SDKInstalled = false;