mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-17.11'

Browse Source 
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
This commit is contained in:
Brad King
2024-06-24 14:19:33 +00:00
committed by Kitware Robot
parent faa61bc634 dfe0f3f358
commit 4f8d39cb59
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -225,10 +225,8 @@ bool cmGlobalVisualStudio10Generator::SetGeneratorToolset(
versionToolsetRegex.match(2));
// Hard-code special cases for toolset versions whose first
// three digits do not match their toolset name.
if (platformToolset == "v143"_s && versionToolset == "v144"_s &&
// VS 17.10 toolset v143 version 14.40.
(this->GeneratorToolsetVersion == "14.40"_s ||
cmHasLiteralPrefix(this->GeneratorToolsetVersion, "14.40."))) {
// The v143 toolset reserves versions 14.30 through 14.49.
if (platformToolset == "v143"_s && versionToolset == "v144"_s) {
versionToolset = "v143";
}
} else {