[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1993-g950e977

Stephen Kelly steveire at gmail.com
Sun Apr 6 20:17:27 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  950e97703093d22f40d479aa13c178293805330c (commit)
       via  843e0a207c7e19d4cc14073493095216f01164d6 (commit)
      from  7d40eac6a04576da54ac1e33fddae83aaa06007d (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=950e97703093d22f40d479aa13c178293805330c
commit 950e97703093d22f40d479aa13c178293805330c
Merge: 7d40eac 843e0a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 20:17:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 20:17:26 2014 -0400

    Merge topic 'MSVC-features' into next
    
    843e0a20 Fix version.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=843e0a207c7e19d4cc14073493095216f01164d6
commit 843e0a207c7e19d4cc14073493095216f01164d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 02:17:08 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 02:17:08 2014 +0200

    Fix version.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 83e59ba..c5209c7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -202,7 +202,7 @@ if(BUILD_TESTING)
       OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
         AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
       OR ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "x${MSVC}"
-        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1600))
+        AND NOT MSVC_VERSION VERSION_LESS 1600))
     ADD_TEST_MACRO(CompileFeatures CompileFeatures)
   endif()
   # assume no resources building to test

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list