diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 15:28:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-22 15:28:31 (GMT) |
| commit | d2fb1264d71d64f48ab8c7f15dc3d1fed4182111 (patch) | |
| tree | e17ae5737ee10f380fe688a4acc18e046e1254e9 /Modules | |
| parent | 4fbae41f889a53903fd5f625ee378b333e8a75fc (diff) | |
| parent | fecf846701ca3a7de4875f5c4362bc79e21b0a4c (diff) | |
| download | CMake-d2fb1264d71d64f48ab8c7f15dc3d1fed4182111.zip CMake-d2fb1264d71d64f48ab8c7f15dc3d1fed4182111.tar.gz CMake-d2fb1264d71d64f48ab8c7f15dc3d1fed4182111.tar.bz2 | |
Merge branch 'doc-prefer-MSVC_VERSION' into release
Diffstat (limited to 'Modules')
| -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) |