summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-22 15:17:39 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-22 15:23:37 (GMT)
commit49a60b70e700e9f0bddc4cb6986d9621423ee2d9 (patch)
treea45f434861bdbb0638a01c38cfc73bcadda93ef3 /Modules
parent66542b663645ffdde8481c1ad60e11fd14c2ccb6 (diff)
downloadCMake-49a60b70e700e9f0bddc4cb6986d9621423ee2d9.zip
CMake-49a60b70e700e9f0bddc4cb6986d9621423ee2d9.tar.gz
CMake-49a60b70e700e9f0bddc4cb6986d9621423ee2d9.tar.bz2
MSVC: Exclude future cl 20+ from MSVC14 variable
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Windows-MSVC.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 0e90d35..31b26b5 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -78,7 +78,9 @@ if(NOT MSVC_VERSION)
set(MSVC90)
set(CMAKE_COMPILER_2005)
set(CMAKE_COMPILER_SUPPORTS_PDBTYPE)
- if(NOT "${_compiler_version}" VERSION_LESS 19)
+ if(NOT "${_compiler_version}" VERSION_LESS 20)
+ # We no longer provide per-version variables. Use MSVC_VERSION instead.
+ elseif(NOT "${_compiler_version}" VERSION_LESS 19)
set(MSVC14 1)
elseif(NOT "${_compiler_version}" VERSION_LESS 18)
set(MSVC12 1)