[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2215-g5a64771
Brad King
brad.king at kitware.com
Thu Apr 10 12:49:45 EDT 2014
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 5a64771f606cea50399d7207d4ee698c6a585f90 (commit)
via f0de3f80bb573b46a803094226ae9e5f1d5e1fbc (commit)
via 105658df0280f2d2fd30cec32e0f4176874b23b0 (commit)
via 101515b958864cbcb42340d0d6d337fec9f44b18 (commit)
from 299ba25588fa40cd75d6eac2c5d56ee79bfd6dd7 (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=5a64771f606cea50399d7207d4ee698c6a585f90
commit 5a64771f606cea50399d7207d4ee698c6a585f90
Merge: 299ba25 f0de3f8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 12:49:44 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 10 12:49:44 2014 -0400
Merge topic 'CMakeDetermineVSServicePack-vs-11-update-4' into next
f0de3f80 CMakeDetermineVSServicePack: Add VS 11 update 4
105658df CMakeDetermineVSServicePack: Match versions more robustly
101515b9 CMakeDetermineVSServicePack: Format documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0de3f80bb573b46a803094226ae9e5f1d5e1fbc
commit f0de3f80bb573b46a803094226ae9e5f1d5e1fbc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 12:26:21 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 10 12:49:14 2014 -0400
CMakeDetermineVSServicePack: Add VS 11 update 4
diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index fbcaec7..2854387 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -26,7 +26,7 @@
# vc80, vc80sp1
# vc90, vc90sp1
# vc100, vc100sp1
-# vc110, vc110sp1, vc110sp2, vc110sp3
+# vc110, vc110sp1, vc110sp2, vc110sp3, vc110sp4
#=============================================================================
# Copyright 2009-2013 Kitware, Inc.
@@ -66,6 +66,8 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)
set(_version "vc110sp2")
elseif(${_cl_version} VERSION_EQUAL "17.00.60610.1")
set(_version "vc110sp3")
+ elseif(${_cl_version} VERSION_EQUAL "17.00.61030")
+ set(_version "vc110sp4")
else()
set(_version "")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=105658df0280f2d2fd30cec32e0f4176874b23b0
commit 105658df0280f2d2fd30cec32e0f4176874b23b0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 11:03:32 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 10 12:49:14 2014 -0400
CMakeDetermineVSServicePack: Match versions more robustly
Use the CMAKE_MATCH_* variables to simplify matching logic. Match
either 3 or 4 version components. Do not fail when there are only three
components available.
diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index d11cdb8..fbcaec7 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -84,27 +84,14 @@ function(_DetermineVSServicePack_FastCheckVersionWithCompiler _SUCCESS_VAR _VER
OUTPUT_QUIET
)
- string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+"
- _cl_version "${_output}")
-
- if(_cl_version)
- string(REGEX MATCHALL "[0-9]+"
- _cl_version_list "${_cl_version}")
- list(GET _cl_version_list 0 _major)
- list(GET _cl_version_list 1 _minor)
- list(GET _cl_version_list 2 _patch)
- list(GET _cl_version_list 3 _tweak)
-
+ if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)")
+ set(_cl_version ${CMAKE_MATCH_1})
+ set(_major ${CMAKE_MATCH_2})
+ set(_minor ${CMAKE_MATCH_3})
if("${_major}${_minor}" STREQUAL "${MSVC_VERSION}")
- set(_cl_version ${_major}.${_minor}.${_patch}.${_tweak})
- else()
- unset(_cl_version)
- endif()
- endif()
-
- if(_cl_version)
set(${_SUCCESS_VAR} true PARENT_SCOPE)
set(${_VERSION_VAR} ${_cl_version} PARENT_SCOPE)
+ endif()
endif()
endif()
endfunction()
@@ -125,20 +112,9 @@ function(_DetermineVSServicePack_CheckVersionWithTryCompile _SUCCESS_VAR _VERSI
file(REMOVE "${CMAKE_BINARY_DIR}/return0.cc")
- string(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+"
- _cl_version "${_output}")
-
- if(_cl_version)
- string(REGEX MATCHALL "[0-9]+"
- _cl_version_list "${_cl_version}")
-
- list(GET _cl_version_list 0 _major)
- list(GET _cl_version_list 1 _minor)
- list(GET _cl_version_list 2 _patch)
- list(GET _cl_version_list 3 _tweak)
-
+ if(_output MATCHES "Compiler Version (([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\.([0-9]+))?)")
set(${_SUCCESS_VAR} true PARENT_SCOPE)
- set(${_VERSION_VAR} ${_major}.${_minor}.${_patch}.${_tweak} PARENT_SCOPE)
+ set(${_VERSION_VAR} "${CMAKE_MATCH_1}" PARENT_SCOPE)
endif()
endfunction()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=101515b958864cbcb42340d0d6d337fec9f44b18
commit 101515b958864cbcb42340d0d6d337fec9f44b18
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 11:01:46 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 10 12:49:14 2014 -0400
CMakeDetermineVSServicePack: Format documentation
Also state explicitly that the module is deprecated.
diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 353aed6..d11cdb8 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -2,15 +2,15 @@
# CMakeDetermineVSServicePack
# ---------------------------
#
-# Determine the Visual Studio service pack of the 'cl' in use.
+# Deprecated. Do not use.
#
-# The functionality of this module has been superseded by the platform
-# variable CMAKE_<LANG>_COMPILER_VERSION that contains the compiler
-# version number.
+# The functionality of this module has been superseded by the
+# :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable that contains
+# the compiler version number.
#
-# Usage:
+# Determine the Visual Studio service pack of the 'cl' in use.
#
-# ::
+# Usage::
#
# if(MSVC)
# include(CMakeDetermineVSServicePack)
@@ -21,14 +21,12 @@
# endif()
#
# Function DetermineVSServicePack sets the given variable to one of the
-# following values or an empty string if unknown:
-#
-# ::
+# following values or an empty string if unknown::
#
# vc80, vc80sp1
# vc90, vc90sp1
# vc100, vc100sp1
-# vc110, vc110sp1, vc110sp2
+# vc110, vc110sp1, vc110sp2, vc110sp3
#=============================================================================
# Copyright 2009-2013 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineVSServicePack.cmake | 58 +++++++++--------------------
1 file changed, 17 insertions(+), 41 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list