Merge topic 'CMakeDetermineVSServicePack-vs11'
2aa62e0
CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)1746a35
CMakeDetermineVSServicePack: Improve documentation
This commit is contained in:
commit
a931970955
|
@ -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()
|
||||
# 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, vc110sp1, vc110sp2
|
||||
|
||||
#=============================================================================
|
||||
# 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>
|
||||
#
|
||||
|
@ -57,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()
|
||||
|
|
Loading…
Reference in New Issue