[Cmake-commits] CMake branch, next, updated. v2.8.2-979-gd34630d

Philip Lowman philip at yhbt.com
Thu Sep 30 21:27:28 EDT 2010


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  d34630d1246763a3985ab93d7770ec03c488b7e0 (commit)
       via  aca758bf29b2a3516150dc24a2c941b13472fc59 (commit)
      from  23e37dbabadbebc2bee6cad3365a31d472bb638a (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=d34630d1246763a3985ab93d7770ec03c488b7e0
commit d34630d1246763a3985ab93d7770ec03c488b7e0
Merge: 23e37db aca758b
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Sep 30 21:27:12 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 30 21:27:12 2010 -0400

    Merge topic '11279' into next
    
    aca758b Fixes issue 11279: CMakeDetermineVSServicePack support for VS10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aca758bf29b2a3516150dc24a2c941b13472fc59
commit aca758bf29b2a3516150dc24a2c941b13472fc59
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Sep 30 21:24:28 2010 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Thu Sep 30 21:24:28 2010 -0400

    Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
    
    Thanks to Aaron C. Meadows for the patch.

diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 8e4eb34..a877e6e 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -23,8 +23,8 @@
 # ===========================
 
 #=============================================================================
-# Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <philip at yhbt.com>
+# Copyright 2009-2010 Kitware, Inc.
+# Copyright 2009-2010 Philip Lowman <philip at yhbt.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -47,6 +47,8 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)
        set(_version "vc90")
    elseif(${_cl_version} VERSION_EQUAL "15.00.30729.01")
        set(_version "vc90sp1")
+   elseif(${_cl_version} VERSION_EQUAL "16.00.30319.01")
+       set(_version "vc100")
    else()
        set(_version "")
    endif()

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list