From d8cf8380fb9a539b3b2b6876f2eb34fc9bddbdac Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 3 Apr 2019 12:03:49 -0400 Subject: MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolset This was forgotten in commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) when the toolset was first renumbered to `v142`. Issue: #19125 --- Modules/Platform/Windows-MSVC.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 2daf313..a6448a0 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -71,7 +71,10 @@ if(NOT MSVC_VERSION) message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}") endif() - if(MSVC_VERSION GREATER_EQUAL 1910) + if(MSVC_VERSION GREATER_EQUAL 1920) + # VS 2019 or greater + set(MSVC_TOOLSET_VERSION 142) + elseif(MSVC_VERSION GREATER_EQUAL 1910) # VS 2017 or greater set(MSVC_TOOLSET_VERSION 141) elseif(MSVC_VERSION EQUAL 1900) -- cgit v0.12