[Cmake-commits] CMake branch, next, updated. v3.1.0-2116-g62809a3

[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  62809a37acf2da6d452c49aacf6963aa60214d02 (commit)
       via  623df63fd4d87bb03cea55a874a3b6cec2deb1e6 (commit)
      from  d35bb00a0232595417de3f4669dc8380a135ab66 (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=62809a37acf2da6d452c49aacf6963aa60214d02
commit 62809a37acf2da6d452c49aacf6963aa60214d02
Merge: d35bb00 623df63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 09:01:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 18 09:01:02 2015 -0500

    Merge topic 'GNU-4.4-compile-features' into next
    
    623df63f Features: Wrap failure-test in UNIX condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=623df63fd4d87bb03cea55a874a3b6cec2deb1e6
commit 623df63fd4d87bb03cea55a874a3b6cec2deb1e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 14:59:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 18 14:59:40 2015 +0100

    Features: Wrap failure-test in UNIX condition.
    
    The use of GNU on non-UNIX for 'compile features' is not
    tested and is not well defined.

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 401de95..5849417 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -25,12 +25,14 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   )
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
-  include(CheckCXXSourceCompiles)
-  check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
-    file_include_works
-  )
-  if (file_include_works)
-    message(SEND_ERROR "Inclusion of ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h was expected to cause an error, but did not.")
+  if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    include(CheckCXXSourceCompiles)
+    check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
+      file_include_works
+    )
+    if (file_include_works)
+      message(SEND_ERROR "Inclusion of ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h was expected to cause an error, but did not.")
+    endif()
   endif()
   return()
 endif()

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

Summary of changes:
 Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake