From dfe0f3f358cb75f42ca43d7abb229324d10a90f1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 24 Jun 2024 08:47:33 -0400 Subject: VS: Fix '-T version=14.4x' under VS 17.1x Starting with VS 17.10 the v143 toolset reserves versions `14.30` through `14.49`. This is the first time that the first three digits of the version do not match the toolset name. Extend the special case from commit d256581bb0 (VS: Fix '-T version=14.40' under VS 17.10 preview 1, 2024-02-19, v3.29.0-rc2~10^2) to cover the entire reserved version range. --- Source/cmGlobalVisualStudio10Generator.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 91fbccc..f24610d 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -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 { -- cgit v0.12