[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2586-g881bf7f

Stephen Kelly steveire at gmail.com
Mon Apr 28 14:48:17 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  881bf7ffe1c85109bde5b28916ed6a802c47a850 (commit)
       via  a63a16f66ac5565472d2dc04f1493ae48eefd6ff (commit)
      from  8723298cd6c9874ead0462483b866c5988351263 (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=881bf7ffe1c85109bde5b28916ed6a802c47a850
commit 881bf7ffe1c85109bde5b28916ed6a802c47a850
Merge: 8723298 a63a16f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 28 14:48:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 28 14:48:16 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    a63a16f6 Test on APPLE.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a63a16f66ac5565472d2dc04f1493ae48eefd6ff
commit a63a16f66ac5565472d2dc04f1493ae48eefd6ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 28 20:47:44 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 28 20:47:44 2014 +0200

    Test on APPLE.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 27c87a0..f5271b5 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 AND UNIX AND NOT APPLE)
+  if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
     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


More information about the Cmake-commits mailing list