[Cmake-commits] CMake branch, next, updated. v2.8.2-482-g137fed4

Brad King brad.king at kitware.com
Tue Aug 17 18:03:48 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  137fed46687377477487365a3e5ad38c3b2e151d (commit)
       via  76ed7f0556192939b63f52d061feb058fdfd689c (commit)
      from  a8ba8329ab0a338e0a1876732c096e3a920aca0d (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=137fed46687377477487365a3e5ad38c3b2e151d
commit 137fed46687377477487365a3e5ad38c3b2e151d
Merge: a8ba832 76ed7f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 17 18:03:46 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 17 18:03:46 2010 -0400

    Merge topic 'msvc-version' into next
    
    76ed7f0 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76ed7f0556192939b63f52d061feb058fdfd689c
commit 76ed7f0556192939b63f52d061feb058fdfd689c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon May 17 10:30:24 2010 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 17 18:02:30 2010 -0400

    Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944)

diff --git a/Modules/CMakeVS6FindMake.cmake b/Modules/CMakeVS6FindMake.cmake
index 0dd21a8..547c594 100644
--- a/Modules/CMakeVS6FindMake.cmake
+++ b/Modules/CMakeVS6FindMake.cmake
@@ -22,3 +22,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
 SET(MSVC60 1)
+SET(MSVC_VERSION 1200)
diff --git a/Modules/CMakeVS71FindMake.cmake b/Modules/CMakeVS71FindMake.cmake
index 8fd332c..85429e0 100644
--- a/Modules/CMakeVS71FindMake.cmake
+++ b/Modules/CMakeVS71FindMake.cmake
@@ -23,3 +23,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
 SET(MSVC71 1)
+SET(MSVC_VERSION 1310)
diff --git a/Modules/CMakeVS7FindMake.cmake b/Modules/CMakeVS7FindMake.cmake
index 7f65a28..47bf0d2 100644
--- a/Modules/CMakeVS7FindMake.cmake
+++ b/Modules/CMakeVS7FindMake.cmake
@@ -22,3 +22,4 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   )
 MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
 SET(MSVC70 1)
+SET(MSVC_VERSION 1300)

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

Summary of changes:
 Modules/CMakeVS6FindMake.cmake  |    1 +
 Modules/CMakeVS71FindMake.cmake |    1 +
 Modules/CMakeVS7FindMake.cmake  |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list