mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-ClangCL-version'

Browse Source 
899376d070 VS: Allow specifying VCTools version with the ClangCL toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8726
This commit is contained in:
Brad King
2023-08-17 14:27:57 +00:00
committed by Kitware Robot
parent cbc14b036a 899376d070
commit 308403ecf3
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -193,33 +193,39 @@ bool cmGlobalVisualStudio10Generator::SetGeneratorToolset(
if (!this->GeneratorToolsetVersion.empty() &&
this->GeneratorToolsetVersion != "Test Toolset Version"_s) {
// If a specific minor version of the toolset was requested, verify that it
// is compatible to the major version and that is exists on disk.
// If not clear the value.
std::string versionToolset = this->GeneratorToolsetVersion;
cmsys::RegularExpression regex("[0-9][0-9]\\.[0-9][0-9]");
if (regex.find(versionToolset)) {
versionToolset = cmStrCat('v', versionToolset.erase(2, 1));
} else {
// Version not recognized. Clear it.
versionToolset.clear();
}
// If a specific minor version of the MSVC toolset is requested, verify
// that it is compatible with the PlatformToolset version. The ability to
// choose a minor version of MSVC has been available since v141.
std::string const& platformToolset = this->GetPlatformToolsetString();
cmsys::RegularExpression vcPlatformToolsetRegex("^v[0-9][0-9][0-9]$");
if (vcPlatformToolsetRegex.find(platformToolset) ||
platformToolset == "Test Toolset"_s) {
std::string versionToolset = this->GeneratorToolsetVersion;
cmsys::RegularExpression versionToolsetRegex("^[0-9][0-9]\\.[0-9][0-9]");
if (versionToolsetRegex.find(versionToolset)) {
versionToolset = cmStrCat('v', versionToolset.erase(2, 1));
} else {
// Version not recognized. Clear it.
versionToolset.clear();
}
if (!cmHasPrefix(versionToolset, this->GetPlatformToolsetString())) {
mf->IssueMessage(MessageType::FATAL_ERROR,
cmStrCat("Generator\n"
" ",
this->GetName(),
"\n"
"given toolset and version specification\n"
" ",
this->GetPlatformToolsetString(),
",version=", this->GeneratorToolsetVersion,
"\n"
"contains an invalid version specification."));
if (!cmHasPrefix(versionToolset, platformToolset)) {
mf->IssueMessage(
MessageType::FATAL_ERROR,
cmStrCat("Generator\n"
" ",
this->GetName(),
"\n"
"given toolset and version specification\n"
" ",
this->GetPlatformToolsetString(),
",version=", this->GeneratorToolsetVersion,
"\n"
"contains an invalid version specification."));
// Clear the configured tool-set
this->GeneratorToolsetVersion.clear();
// Clear the configured tool-set
this->GeneratorToolsetVersion.clear();
}
}
std::string auxProps;