diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-24 13:43:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-06-24 13:43:02 (GMT) |
| commit | be53dcdda640dbbf1022049740f3aae1fd7b0f90 (patch) | |
| tree | 1062f0f0e88606297d412f03bc47d5e6752821ec /Source | |
| parent | 1deb5430890e7473a51f3764a9bf906cef267ebd (diff) | |
| parent | dfe0f3f358cb75f42ca43d7abb229324d10a90f1 (diff) | |
| download | CMake-be53dcdda640dbbf1022049740f3aae1fd7b0f90.zip CMake-be53dcdda640dbbf1022049740f3aae1fd7b0f90.tar.gz CMake-be53dcdda640dbbf1022049740f3aae1fd7b0f90.tar.bz2 | |
Merge topic 'vs-17.11' into release-3.29
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 6 |
1 files 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 { |