[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1986-g2594477

Stephen Kelly steveire at gmail.com
Sun Apr 6 17:48:52 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  2594477af733ae51bc601bfd4282624b67ce578a (commit)
       via  757c559525f9bcab52d769e437826746b63b2202 (commit)
      from  7c43d44e06738b262c22f7a76903c7150df0fa99 (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=2594477af733ae51bc601bfd4282624b67ce578a
commit 2594477af733ae51bc601bfd4282624b67ce578a
Merge: 7c43d44 757c559
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 17:48:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 17:48:52 2014 -0400

    Merge topic 'MSVC-features' into next
    
    757c5595 Fix test condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=757c559525f9bcab52d769e437826746b63b2202
commit 757c559525f9bcab52d769e437826746b63b2202
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 23:46:56 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 23:46:56 2014 +0200

    Fix test condition.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d5cbee9..83e59ba 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 "x${MSVC}"
         AND NOT CMAKE_CXX_COMPILER_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