[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2685-g0c73924

[Brad King]

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  0c7392465c901711904a5c08361b384f44a496ee (commit)
       via  2aa62e0b4bd311e7538082fea70785871572e420 (commit)
       via  1746a35df115e66a266481020591de231bfdfdf2 (commit)
      from  d6841889d49e0f305409dfffa7cc938949e05556 (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=0c7392465c901711904a5c08361b384f44a496ee
commit 0c7392465c901711904a5c08361b384f44a496ee
Merge: d684188 2aa62e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 21 08:55:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 21 08:55:47 2013 -0400

    Merge topic 'CMakeDetermineVSServicePack-vs11' into next
    
    2aa62e0 CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)
    1746a35 CMakeDetermineVSServicePack: Improve documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa62e0b4bd311e7538082fea70785871572e420
commit 2aa62e0b4bd311e7538082fea70785871572e420
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 21 08:51:13 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 21 08:51:13 2013 -0400

    CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 26c8ac0..17b4bbf 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -16,7 +16,7 @@
 #  vc80, vc80sp1
 #  vc90, vc90sp1
 #  vc100, vc100sp1
-#  vc110
+#  vc110, vc110sp1, vc110sp2
 
 #=============================================================================
 # Copyright 2009-2013 Kitware, Inc.
@@ -50,6 +50,10 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)
        set(_version "vc100sp1")
    elseif(${_cl_version} VERSION_EQUAL "17.00.50727.1")
        set(_version "vc110")
+   elseif(${_cl_version} VERSION_EQUAL "17.00.51106.1")
+       set(_version "vc110sp1")
+   elseif(${_cl_version} VERSION_EQUAL "17.00.60315.1")
+       set(_version "vc110sp2")
    else()
        set(_version "")
    endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1746a35df115e66a266481020591de231bfdfdf2
commit 1746a35df115e66a266481020591de231bfdfdf2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 21 08:48:58 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 21 08:48:58 2013 -0400

    CMakeDetermineVSServicePack: Improve documentation
    
    Refer users to the newer CMAKE_<LANG>_COMPILER_VERSION variables.
    Use a more concise summary.  Format the documentation to look
    better in the "cmake --help-module" output.

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 98e5bb8..26c8ac0 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -1,32 +1,25 @@
-# - Includes a public function for assisting users in trying to determine the
-# Visual Studio service pack in use.
-#
-# Sets the passed in variable to one of the following values or an empty
-# string if unknown.
-#    vc80
-#    vc80sp1
-#    vc90
-#    vc90sp1
-#    vc100
-#    vc100sp1
-#    vc110
+# - Determine the Visual Studio service pack of the 'cl' in use.
+# The functionality of this module has been superseded by the platform
+# variable CMAKE_<LANG>_COMPILER_VERSION that contains the compiler version
+# number.
 #
 # Usage:
-# ===========================
-#
-#    if(MSVC)
-#       include(CMakeDetermineVSServicePack)
-#       DetermineVSServicePack( my_service_pack )
-#
-#       if( my_service_pack )
-#           message(STATUS "Detected: ${my_service_pack}")
-#       endif()
+#  if(MSVC)
+#    include(CMakeDetermineVSServicePack)
+#    DetermineVSServicePack( my_service_pack )
+#    if( my_service_pack )
+#      message(STATUS "Detected: ${my_service_pack}")
 #    endif()
-#
-# ===========================
+#  endif()
+# Function DetermineVSServicePack sets the given variable to one of the
+# following values or an empty string if unknown:
+#  vc80, vc80sp1
+#  vc90, vc90sp1
+#  vc100, vc100sp1
+#  vc110
 
 #=============================================================================
-# Copyright 2009-2011 Kitware, Inc.
+# Copyright 2009-2013 Kitware, Inc.
 # Copyright 2009-2010 Philip Lowman <philip at yhbt.com>
 # Copyright 2010-2011 Aaron C. meadows <cmake at shadowguarddev.com>
 #

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

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


hooks/post-receive
-- 
CMake