[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-577-g606c1fc
Kitware Robot
kwrobot at kitware.com
Wed Mar 22 11:35:09 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 606c1fcdf87b319fe10f2ad100508b16f23a4e59 (commit)
via fecf846701ca3a7de4875f5c4362bc79e21b0a4c (commit)
via 712452e33088b1ba02c7dde10f56cd2add81deab (commit)
via 49a60b70e700e9f0bddc4cb6986d9621423ee2d9 (commit)
from 377cd0876d8101934496d83ab86c06cd6b2ba246 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=606c1fcdf87b319fe10f2ad100508b16f23a4e59
commit 606c1fcdf87b319fe10f2ad100508b16f23a4e59
Merge: 377cd08 fecf846
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 15:29:33 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 22 11:29:37 2017 -0400
Stage topic 'doc-prefer-MSVC_VERSION'
Topic-id: 23180
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/609
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fecf846701ca3a7de4875f5c4362bc79e21b0a4c
commit fecf846701ca3a7de4875f5c4362bc79e21b0a4c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:22:35 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:24:54 2017 -0400
Help: Document preference of `MSVC_VERSION` over `MSVC##`
Issue: #16735
diff --git a/Help/variable/MSVC.rst b/Help/variable/MSVC.rst
index 913ed08..22a087a 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 98e0493..55c6337 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 42b7b86..17943dc 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 0648f35..a524fab 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 16bfe07..79e0c10 100644
--- a/Help/variable/MSVC14.rst
+++ b/Help/variable/MSVC14.rst
@@ -1,5 +1,7 @@
MSVC14
------
+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 14f09cf..14164bf 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 76fa96f..ed3b0bb 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 d69d4fc..0237592 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 0d33e82..1533218 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 1716e6f..4981ecf 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.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=712452e33088b1ba02c7dde10f56cd2add81deab
commit 712452e33088b1ba02c7dde10f56cd2add81deab
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:12:13 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:24:46 2017 -0400
Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
Issue: #16735
diff --git a/Help/variable/MSVC14.rst b/Help/variable/MSVC14.rst
index f67ebc7..16bfe07 100644
--- a/Help/variable/MSVC14.rst
+++ b/Help/variable/MSVC14.rst
@@ -1,5 +1,5 @@
MSVC14
------
-``True`` when using the Microsoft Visual Studio ``v140`` toolset
-(``cl`` version 19) or another compiler that simulates it.
+``True`` when using the Microsoft Visual Studio ``v140`` or ``v141``
+toolset (``cl`` version 19) or another compiler that simulates it.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49a60b70e700e9f0bddc4cb6986d9621423ee2d9
commit 49a60b70e700e9f0bddc4cb6986d9621423ee2d9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:17:39 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:23:37 2017 -0400
MSVC: Exclude future cl 20+ from MSVC14 variable
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 0e90d35..31b26b59 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)
-----------------------------------------------------------------------
Summary of changes:
Help/variable/MSVC.rst | 2 ++
Help/variable/MSVC10.rst | 2 ++
Help/variable/MSVC11.rst | 2 ++
Help/variable/MSVC12.rst | 2 ++
Help/variable/MSVC14.rst | 6 ++++--
Help/variable/MSVC60.rst | 2 ++
Help/variable/MSVC70.rst | 2 ++
Help/variable/MSVC71.rst | 2 ++
Help/variable/MSVC80.rst | 2 ++
Help/variable/MSVC90.rst | 2 ++
Modules/Platform/Windows-MSVC.cmake | 4 +++-
11 files changed, 25 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list