From 1746a35df115e66a266481020591de231bfdfdf2 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 21 Jun 2013 08:48:58 -0400
Subject: [PATCH 1/2] 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.
---
 Modules/CMakeDetermineVSServicePack.cmake | 41 ++++++++++-------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 98e5bb873..26c8ac0a5 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@yhbt.com>
 # Copyright 2010-2011 Aaron C. meadows <cmake@shadowguarddev.com>
 #

From 2aa62e0b4bd311e7538082fea70785871572e420 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 21 Jun 2013 08:51:13 -0400
Subject: [PATCH 2/2] CMakeDetermineVSServicePack: Add VS 11 update 1 and 2
 (#14239)

---
 Modules/CMakeDetermineVSServicePack.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 26c8ac0a5..17b4bbf03 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()