[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2816-ge9d5dbf

Brad King brad.king at kitware.com
Fri Jun 28 09:43:56 EDT 2013


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  e9d5dbf8efbe9199091c14d00b15881f1406531d (commit)
       via  f449c68be076cb15731f3206b19415e86bee5659 (commit)
      from  b1aba61fd2aadce0da5c2068b3f97792bc866c55 (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=e9d5dbf8efbe9199091c14d00b15881f1406531d
commit e9d5dbf8efbe9199091c14d00b15881f1406531d
Merge: b1aba61 f449c68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 28 09:43:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 09:43:52 2013 -0400

    Merge topic 'CMakeDetermineVSServicePack-vs11' into next
    
    f449c68 CMakeDetermineVSServicePack: Add VS 11 update 3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f449c68be076cb15731f3206b19415e86bee5659
commit f449c68be076cb15731f3206b19415e86bee5659
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 28 09:43:10 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 28 09:43:10 2013 -0400

    CMakeDetermineVSServicePack: Add VS 11 update 3

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 17b4bbf..f49482e 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -54,6 +54,8 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)
        set(_version "vc110sp1")
    elseif(${_cl_version} VERSION_EQUAL "17.00.60315.1")
        set(_version "vc110sp2")
+   elseif(${_cl_version} VERSION_EQUAL "17.00.60610.1")
+       set(_version "vc110sp3")
    else()
        set(_version "")
    endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineVSServicePack.cmake |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list