diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-23 12:44:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-23 12:44:58 (GMT) |
| commit | cfa55fd428360776c442a5e3c5724c6253265fed (patch) | |
| tree | dec5ac10b94ddb0bf4adf56489cda224c187a378 /Modules/Platform | |
| parent | a1440504ffd18f155404b8bf44466172e9a8054d (diff) | |
| parent | fecf846701ca3a7de4875f5c4362bc79e21b0a4c (diff) | |
| download | CMake-cfa55fd428360776c442a5e3c5724c6253265fed.zip CMake-cfa55fd428360776c442a5e3c5724c6253265fed.tar.gz CMake-cfa55fd428360776c442a5e3c5724c6253265fed.tar.bz2 | |
Merge topic 'doc-prefer-MSVC_VERSION'
fecf8467 Help: Document preference of `MSVC_VERSION` over `MSVC##`
712452e3 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
49a60b70 MSVC: Exclude future cl 20+ from MSVC14 variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !609
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
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) |