summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-10-20 17:47:16 (GMT)
committerBrad King <brad.king@kitware.com>2021-10-29 15:52:57 (GMT)
commit3213e2595da3ce75af489a63f53b05c5560aa547 (patch)
tree5458a913a2faaf5dbf73478e00c775ae2a1e2722
parent152f9978dde5ff085db28835c797827870978e9c (diff)
downloadCMake-3213e2595da3ce75af489a63f53b05c5560aa547.zip
CMake-3213e2595da3ce75af489a63f53b05c5560aa547.tar.gz
CMake-3213e2595da3ce75af489a63f53b05c5560aa547.tar.bz2
cmVSSetupHelper: Drop unused ullVersion field
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).
-rw-r--r--Source/cmVSSetupHelper.cxx7
-rw-r--r--Source/cmVSSetupHelper.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx
index 969a2c2..1b67611 100644
--- a/Source/cmVSSetupHelper.cxx
+++ b/Source/cmVSSetupHelper.cxx
@@ -164,17 +164,11 @@ bool cmVSSetupAPIHelper::GetVSInstanceInfo(
return false;
}
- ULONGLONG ullVersion = 0;
SmartBSTR bstrVersion;
if (FAILED(pInstance->GetInstallationVersion(&bstrVersion))) {
return false;
} else {
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.
@@ -316,7 +310,6 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
chosenInstanceInfo.Version =
std::wstring(envVSVersion.begin(), envVSVersion.end());
chosenInstanceInfo.VCToolsetVersion = envVSVersion;
- chosenInstanceInfo.ullVersion = std::stoi(envVSVersion);
chosenInstanceInfo.IsWin10SDKInstalled = true;
chosenInstanceInfo.IsWin81SDKInstalled = !envWindowsSdkDir81.empty();
return true;
diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h
index 61a3ac7..b2ba086 100644
--- a/Source/cmVSSetupHelper.h
+++ b/Source/cmVSSetupHelper.h
@@ -88,7 +88,6 @@ struct VSInstanceInfo
std::wstring VSInstallLocation;
std::wstring Version;
std::string VCToolsetVersion;
- ULONGLONG ullVersion = 0; // A.B.C.D = (A<<48)|(B<<32)|(C<<16)|D
bool IsWin10SDKInstalled = false;
bool IsWin81SDKInstalled = false;