[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5574-g3bac6b9

[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  3bac6b9b3696c40f37f9c6e2c825d517261c38dd (commit)
       via  c40fe094270afb3b819d5dceeadd0635763de323 (commit)
      from  be5a1368299743dccb7a4d7abfb6bde99cdc4170 (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=3bac6b9b3696c40f37f9c6e2c825d517261c38dd
commit 3bac6b9b3696c40f37f9c6e2c825d517261c38dd
Merge: be5a136 c40fe09
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 04:30:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 04:30:36 2013 -0500

    Merge topic 'target_compile_features' into next
    
    c40fe09 Don't unintentionally match AppleClang.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c40fe094270afb3b819d5dceeadd0635763de323
commit c40fe094270afb3b819d5dceeadd0635763de323
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 10:27:33 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 10:27:33 2013 +0100

    Don't unintentionally match AppleClang.
    
    Only run the msvcxx_sealed test for MSVC, not for Clang.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 7276935..0ff0580 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -2,13 +2,12 @@ cmake_minimum_required(VERSION 2.8.12)
 cmake_policy(SET CMP0025 NEW)
 project(target_compile_features)
 
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
+    OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
   add_executable(gnuxx_typeof_test gnuxx_typeof_test.cpp)
 endif()
-if (("${CMAKE_CXX_COMPILER}" MATCHES "MSVC"
+if ("${CMAKE_CXX_COMPILER}" MATCHES "MSVC"
       AND NOT MSVC_VERSION VERSION_LESS 1400)
-    OR ("${CMAKE_CXX_COMPILER}" STREQUAL "Clang"
-      AND "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC"))
   add_executable(msvcxx_sealed_test msvcxx_sealed_test.cpp)
 endif()
 

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

Summary of changes:
 .../target_compile_features/CMakeLists.txt         |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake