[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3884-g4453820

[Rolf Eike Beer]

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  44538208d95136ca2562f997601ab2c05b503168 (commit)
       via  3ec4446af4f0cc1b7525d5b9a8e8c14277422e06 (commit)
      from  54ccc9526e2478a751d0efe654d4148425401948 (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=44538208d95136ca2562f997601ab2c05b503168
commit 44538208d95136ca2562f997601ab2c05b503168
Merge: 54ccc95 3ec4446
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 14 16:42:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 14 16:42:31 2013 -0400

    Merge topic 'cxx11' into next
    
    3ec4446 CXXFeatures: include compiler log when test fails


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ec4446af4f0cc1b7525d5b9a8e8c14277422e06
commit 3ec4446af4f0cc1b7525d5b9a8e8c14277422e06
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 14 22:42:11 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Aug 14 22:42:11 2013 +0200

    CXXFeatures: include compiler log when test fails

diff --git a/Tests/Module/FindCXXFeatures/CMakeLists.txt b/Tests/Module/FindCXXFeatures/CMakeLists.txt
index d655bbb..e70bfdd 100644
--- a/Tests/Module/FindCXXFeatures/CMakeLists.txt
+++ b/Tests/Module/FindCXXFeatures/CMakeLists.txt
@@ -241,6 +241,8 @@ endif ()
 
 find_package(CXXFeatures)
 
+unset(_send_logs)
+
 foreach (flag IN LISTS _all_cxx_features)
     list(FIND _expected_features "${flag}" _flag_index)
     set(_full_flag CXXFeatures_${flag}_FOUND)
@@ -253,6 +255,7 @@ foreach (flag IN LISTS _all_cxx_features)
     else ()
         if (NOT _flag_index EQUAL -1)
             message(SEND_ERROR "Expected C++ feature '${flag}' not detected")
+            set(_send_logs TRUE)
         endif ()
     endif ()
 endforeach (flag)
@@ -263,6 +266,7 @@ if (NOT "${CXX11_COMPILER_FLAGS}" STREQUAL "${_expected_cxx11_flag}")
         message(WARNING    "Found C++11 flag '${CXX11_COMPILER_FLAGS}' but expected '${_expected_cxx11_flag}'")
     else ()
         message(SEND_ERROR "Found C++11 flag '${CXX11_COMPILER_FLAGS}' but expected '${_expected_cxx11_flag}'")
+        set(_send_logs TRUE)
     endif ()
 endif ()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
@@ -272,3 +276,14 @@ enable_testing()
 if (NOT CROSS_COMPILING)
     add_test(NAME FindCXXFeatures COMMAND FindCXXFeatures)
 endif ()
+
+if (_send_logs)
+    if (EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log")
+        file(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log" _output_log)
+        message(STATUS "-=-=-= Compiler output log:\n${_output_log}\n")
+    endif ()
+    if (EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log")
+        file(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log" _error_log)
+        message(STATUS "-=-=-= Compiler error log:\n${_error_log}\n")
+    endif ()
+endif ()

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

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


hooks/post-receive
-- 
CMake