mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-default-toolset'

Browse Source 
c50df859c5 VS: Restore support for two-part default toolset version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7864
This commit is contained in:
Brad King
2022-11-04 15:26:17 +00:00
committed by Kitware Robot
parent def28893f1 c50df859c5
commit dd8065fdda
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -802,26 +802,28 @@ cmGlobalVisualStudioVersionedGenerator::FindAuxToolset(
"*/Microsoft.VCToolsVersion."_s, twoComponent, "*.txt"_s);
cmsys::Glob glob;
glob.SetRecurseThroughSymlinks(false);
// Since we are only using the first two components of the toolset version,
// we require a definite match
if (glob.FindFiles(pattern) && glob.GetFiles().size() == 1) {
std::string const& txt = glob.GetFiles()[0];
std::string ver;
cmsys::ifstream fin(txt.c_str());
if (fin && std::getline(fin, ver)) {
// Strip trailing whitespace.
ver = ver.substr(0, ver.find_first_not_of("0123456789."));
// We assume the version is correct, since it is the only one that
// matched.
cmsys::RegularExpression extractVersion(
"VCToolsVersion\\.([0-9.]+)\\.txt$");
if (extractVersion.find(txt)) {
version = extractVersion.match(1);
if (glob.FindFiles(pattern) && !glob.GetFiles().empty()) {
// Since we are only using the first two components of the
// toolset version, we require a single match.
if (glob.GetFiles().size() == 1) {
std::string const& txt = glob.GetFiles()[0];
std::string ver;
cmsys::ifstream fin(txt.c_str());
if (fin && std::getline(fin, ver)) {
// Strip trailing whitespace.
ver = ver.substr(0, ver.find_first_not_of("0123456789."));
// We assume the version is correct, since it is the only one that
// matched.
cmsys::RegularExpression extractVersion(
"VCToolsVersion\\.([0-9.]+)\\.txt$");
if (extractVersion.find(txt)) {
version = extractVersion.match(1);
}
}
} else {
props = cmStrCat(instancePath, "/VC/Auxiliary/Build/"_s);
return AuxToolset::PropsIndeterminate;
}
} else {
props = cmStrCat(instancePath, "/VC/Auxiliary/Build/"_s);
return AuxToolset::PropsIndeterminate;
}
}