[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2577-g897f685

[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  897f685f9d3a1e28bd3531ab181145ef76411192 (commit)
       via  bf60be87a9e5bb3a308e031604fd4247fb51527b (commit)
      from  042e42a388062d8d121902b9834928266a4c6c2f (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=897f685f9d3a1e28bd3531ab181145ef76411192
commit 897f685f9d3a1e28bd3531ab181145ef76411192
Merge: 042e42a bf60be8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 26 08:53:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 26 08:53:19 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    bf60be87 Restrict the platforms of the WriteCompilerDetectionHeader test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf60be87a9e5bb3a308e031604fd4247fb51527b
commit bf60be87a9e5bb3a308e031604fd4247fb51527b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 26 14:51:33 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 26 14:52:42 2014 +0200

    Restrict the platforms of the WriteCompilerDetectionHeader test.
    
    This is the same condition used to do the feature tests for the
    moment in GNU-CXX.cmake.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f5271b5..27c87a0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -411,7 +411,7 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
   ADD_TEST_MACRO(Module.FindDependency FindDependency)
 
-  if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+  if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND UNIX AND NOT APPLE)
     ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)
   endif()
   if (APPLE OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake