[Cmake-commits] CMake branch, next, updated. v2.8.9-691-g9a49bd7
Philip Lowman
philip at yhbt.com
Fri Sep 21 23:15:50 EDT 2012
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 9a49bd7107b74669baf8dc6b29985ca4fe0f301c (commit)
via a7227804984383ed864ba1b2b6081d28b103ddff (commit)
from 15a3d70fd097768783ac7d58cb5167d852c78f81 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a49bd7107b74669baf8dc6b29985ca4fe0f301c
commit 9a49bd7107b74669baf8dc6b29985ca4fe0f301c
Merge: 15a3d70 a722780
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Fri Sep 21 23:15:48 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 21 23:15:48 2012 -0400
Merge topic 'DetermineVsServicePack2012' into next
a722780 CMakeDetermineVSServicePack: Visual Studio 2012 added
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7227804984383ed864ba1b2b6081d28b103ddff
commit a7227804984383ed864ba1b2b6081d28b103ddff
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Fri Sep 21 23:11:18 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Fri Sep 21 23:11:18 2012 -0400
CMakeDetermineVSServicePack: Visual Studio 2012 added
diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 33f0141..98e5bb8 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -9,6 +9,7 @@
# vc90sp1
# vc100
# vc100sp1
+# vc110
#
# Usage:
# ===========================
@@ -54,6 +55,8 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)
set(_version "vc100")
elseif(${_cl_version} VERSION_EQUAL "16.00.40219.01")
set(_version "vc100sp1")
+ elseif(${_cl_version} VERSION_EQUAL "17.00.50727.1")
+ set(_version "vc110")
else()
set(_version "")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineVSServicePack.cmake | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list