[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2890-g10373b3

Stephen Kelly steveire at gmail.com
Tue May 6 17:32:49 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  10373b3fa5639e4c4ffa161254872892c48e2589 (commit)
       via  4e2b5c7ae131181eaff885ca14448efd6473a578 (commit)
      from  cba0beda6974c7ee227345ae04c5f135d854dc3f (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=10373b3fa5639e4c4ffa161254872892c48e2589
commit 10373b3fa5639e4c4ffa161254872892c48e2589
Merge: cba0bed 4e2b5c7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 17:32:48 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 17:32:48 2014 -0400

    Merge topic 'clang-features' into next
    
    4e2b5c7a Exclude FreeBSD.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e2b5c7ae131181eaff885ca14448efd6473a578
commit 4e2b5c7ae131181eaff885ca14448efd6473a578
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 23:32:20 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 23:32:20 2014 +0200

    Exclude FreeBSD.

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index b329244..21d1913 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.0.0)
 project(WriteCompilerDetectionHeader)
 
-if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU
+if ((NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU
     AND NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
   file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
     "int main(int,char**) { return 0; }\n"
   )

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list