diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 11:28:31 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-22 11:28:31 -0400 |
| commit | d2fb1264d71d64f48ab8c7f15dc3d1fed4182111 (patch) | |
| tree | e17ae5737ee10f380fe688a4acc18e046e1254e9 | |
| parent | 4fbae41f889a53903fd5f625ee378b333e8a75fc (diff) | |
| parent | fecf846701ca3a7de4875f5c4362bc79e21b0a4c (diff) | |
| download | cmake-d2fb1264d71d64f48ab8c7f15dc3d1fed4182111.tar.gz | |
Merge branch 'doc-prefer-MSVC_VERSION' into release
| -rw-r--r-- | Help/variable/MSVC.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC10.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC11.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC12.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC14.rst | 6 | ||||
| -rw-r--r-- | Help/variable/MSVC60.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC70.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC71.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC80.rst | 2 | ||||
| -rw-r--r-- | Help/variable/MSVC90.rst | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
11 files changed, 25 insertions, 3 deletions
diff --git a/Help/variable/MSVC.rst b/Help/variable/MSVC.rst index 913ed080ca..22a087a778 100644 --- a/Help/variable/MSVC.rst +++ b/Help/variable/MSVC.rst @@ -4,3 +4,5 @@ MSVC ``True`` when using Microsoft Visual C++. Set to ``true`` when the compiler is some version of Microsoft Visual C++. + +See also the :variable:`MSVC_VERSION` variable. diff --git a/Help/variable/MSVC10.rst b/Help/variable/MSVC10.rst index 98e0493d3e..55c63371f3 100644 --- a/Help/variable/MSVC10.rst +++ b/Help/variable/MSVC10.rst @@ -1,5 +1,7 @@ MSVC10 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using the Microsoft Visual Studio ``v100`` toolset (``cl`` version 16) or another compiler that simulates it. diff --git a/Help/variable/MSVC11.rst b/Help/variable/MSVC11.rst index 42b7b866a6..17943dcc45 100644 --- a/Help/variable/MSVC11.rst +++ b/Help/variable/MSVC11.rst @@ -1,5 +1,7 @@ MSVC11 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using the Microsoft Visual Studio ``v110`` toolset (``cl`` version 17) or another compiler that simulates it. diff --git a/Help/variable/MSVC12.rst b/Help/variable/MSVC12.rst index 0648f351a2..a524fab3b0 100644 --- a/Help/variable/MSVC12.rst +++ b/Help/variable/MSVC12.rst @@ -1,5 +1,7 @@ MSVC12 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using the Microsoft Visual Studio ``v120`` toolset (``cl`` version 18) or another compiler that simulates it. diff --git a/Help/variable/MSVC14.rst b/Help/variable/MSVC14.rst index f67ebc75ca..79e0c10b58 100644 --- a/Help/variable/MSVC14.rst +++ b/Help/variable/MSVC14.rst @@ -1,5 +1,7 @@ MSVC14 ------ -``True`` when using the Microsoft Visual Studio ``v140`` toolset -(``cl`` version 19) or another compiler that simulates it. +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + +``True`` when using the Microsoft Visual Studio ``v140`` or ``v141`` +toolset (``cl`` version 19) or another compiler that simulates it. diff --git a/Help/variable/MSVC60.rst b/Help/variable/MSVC60.rst index 14f09cfadb..14164bf76a 100644 --- a/Help/variable/MSVC60.rst +++ b/Help/variable/MSVC60.rst @@ -1,6 +1,8 @@ MSVC60 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using Microsoft Visual C++ 6.0. Set to ``true`` when the compiler is version 6.0 of Microsoft Visual C++. diff --git a/Help/variable/MSVC70.rst b/Help/variable/MSVC70.rst index 76fa96fa9a..ed3b0bbdfa 100644 --- a/Help/variable/MSVC70.rst +++ b/Help/variable/MSVC70.rst @@ -1,6 +1,8 @@ MSVC70 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using Microsoft Visual C++ 7.0. Set to ``true`` when the compiler is version 7.0 of Microsoft Visual C++. diff --git a/Help/variable/MSVC71.rst b/Help/variable/MSVC71.rst index d69d4fc10f..0237592c61 100644 --- a/Help/variable/MSVC71.rst +++ b/Help/variable/MSVC71.rst @@ -1,6 +1,8 @@ MSVC71 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using Microsoft Visual C++ 7.1. Set to ``true`` when the compiler is version 7.1 of Microsoft Visual C++. diff --git a/Help/variable/MSVC80.rst b/Help/variable/MSVC80.rst index 0d33e826aa..1533218a93 100644 --- a/Help/variable/MSVC80.rst +++ b/Help/variable/MSVC80.rst @@ -1,5 +1,7 @@ MSVC80 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using the Microsoft Visual Studio ``v80`` toolset (``cl`` version 14) or another compiler that simulates it. diff --git a/Help/variable/MSVC90.rst b/Help/variable/MSVC90.rst index 1716e6f3f5..4981ecff05 100644 --- a/Help/variable/MSVC90.rst +++ b/Help/variable/MSVC90.rst @@ -1,5 +1,7 @@ MSVC90 ------ +Discouraged. Use the :variable:`MSVC_VERSION` variable instead. + ``True`` when using the Microsoft Visual Studio ``v90`` toolset (``cl`` version 15) or another compiler that simulates it. diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 0e90d35fd2..31b26b5927 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) |