[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1995-gd8d6167

Stephen Kelly steveire at gmail.com
Mon Apr 7 02:23:59 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  d8d6167310c2faf156caa977e7bfd4e431b0c7d6 (commit)
       via  4103534acb3be6b3edfe0b93fe2f98e157037432 (commit)
      from  950e97703093d22f40d479aa13c178293805330c (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=d8d6167310c2faf156caa977e7bfd4e431b0c7d6
commit d8d6167310c2faf156caa977e7bfd4e431b0c7d6
Merge: 950e977 4103534
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 02:23:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 02:23:58 2014 -0400

    Merge topic 'MSVC-features' into next
    
    4103534a Fix version.


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

    Fix version.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c5209c7..e5adadf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -201,7 +201,7 @@ if(BUILD_TESTING)
         AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
       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}"
+      OR ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
         AND NOT MSVC_VERSION VERSION_LESS 1600))
     ADD_TEST_MACRO(CompileFeatures CompileFeatures)
   endif()

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

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