summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-04-03 12:03:49 -0400
committerBrad King <brad.king@kitware.com>2021-09-02 13:47:42 -0400
commitf01ea7e391a23622df2943dc0931a36c5c507bc5 (patch)
treee62c323323292299789a02898ff52eaf84c9b991
parent31c5700d4322ecfa169db2fccf385d6eced4e737 (diff)
downloadcmake-f01ea7e391a23622df2943dc0931a36c5c507bc5.tar.gz
MSVC: Fix MSVC_TOOLSET_VERSION for VS 2022 v143 toolset
This was forgotten in commit 0c7f918fb1 (VS: Update Visual Studio 17 2022 generator for Preview 2, 2021-07-14, v3.21.1~29^2) when the toolset was first renumbered to `v143`. Fixes: #22585
-rw-r--r--Modules/Platform/Windows-MSVC.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 4223bde8cf..7d602c30ee 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -67,7 +67,10 @@ if(NOT MSVC_VERSION)
message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}")
endif()
- if(MSVC_VERSION GREATER_EQUAL 1920)
+ if(MSVC_VERSION GREATER_EQUAL 1930)
+ # VS 2022 or greater
+ set(MSVC_TOOLSET_VERSION 143)
+ elseif(MSVC_VERSION GREATER_EQUAL 1920)
# VS 2019 or greater
set(MSVC_TOOLSET_VERSION 142)
elseif(MSVC_VERSION GREATER_EQUAL 1910)