[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1984-g7c43d44

[Stephen Kelly]

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  7c43d44e06738b262c22f7a76903c7150df0fa99 (commit)
       via  769b31896c495b5ea0dc823c26e1c35a1559da44 (commit)
      from  19b85fea867ff0572e80ea89cf5bd4ac6c01a661 (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=7c43d44e06738b262c22f7a76903c7150df0fa99
commit 7c43d44e06738b262c22f7a76903c7150df0fa99
Merge: 19b85fe 769b318
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 17:40:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 17:40:26 2014 -0400

    Merge topic 'MSVC-features' into next
    
    769b3189 Fix test logic.


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

    Fix test logic.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3d00c31..d5cbee9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -198,11 +198,11 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
   ADD_TEST_MACRO(MathTest MathTest)
   if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
-      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+        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 (CMAKE_CXX_COMPILER_ID STREQUAL MSVC
-      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1600))
+        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))
     ADD_TEST_MACRO(CompileFeatures CompileFeatures)
   endif()
   # assume no resources building to test

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

Summary of changes:
 Tests/CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake