[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5941-g8378ae9

[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  8378ae956f86a693c9f6ec0e639e65822eb35e27 (commit)
       via  e9265dd74de00f8fc03ccbf9c2fd8e11e058eb6b (commit)
      from  8318c9347c4f6217556e32f0105358d55fa20257 (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=8378ae956f86a693c9f6ec0e639e65822eb35e27
commit 8378ae956f86a693c9f6ec0e639e65822eb35e27
Merge: 8318c93 e9265dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 30 06:00:12 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 30 06:00:12 2013 -0500

    Merge topic 'target_compile_features' into next
    
    e9265dd Don't run test on AppleClang.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9265dd74de00f8fc03ccbf9c2fd8e11e058eb6b
commit e9265dd74de00f8fc03ccbf9c2fd8e11e058eb6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 30 11:59:23 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 30 11:59:52 2013 +0100

    Don't run test on AppleClang.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2b8b504..0d86cd9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -415,6 +415,16 @@ if(BUILD_TESTING)
   if ((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
       OR CMAKE_CXX_COMPILER_ID STREQUAL Clang
       OR (x${CMAKE_CXX_COMPILER_ID} STREQUAL xMSVC AND NOT MSVC_VERSION VERSION_LESS 1400))
+    set(runCompilerDetectionTest 1)
+  endif()
+
+  if(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    if(NOT APPLE OR POLICY CMP0025)
+      set(runCompilerDetectionTest 1)
+    endif()
+  endif()
+
+  if (runCompilerDetectionTest)
     ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)
   endif()
 

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

Summary of changes:
 Tests/CMakeLists.txt |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake