[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3880-ge6ccd6d

[Brad King]

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  e6ccd6d772f294cf80775e7abbb4a5555fda07de (commit)
       via  51ce1aeba8bced872731e51b8911b97d08b2f5f7 (commit)
       via  cabd6f87c048c5c63a5145652729606ec36612da (commit)
      from  2470c74a479aa4fb41f31db3c27cc0fb9330b3dc (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=e6ccd6d772f294cf80775e7abbb4a5555fda07de
commit e6ccd6d772f294cf80775e7abbb4a5555fda07de
Merge: 2470c74 51ce1ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 14 13:55:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 14 13:55:30 2013 -0400

    Merge topic 'cxx11' into next
    
    51ce1ae CXXFeatures: check for /Qstd=c++11 only with Intel on Windows
    cabd6f8 CXXFeatures: log check outputs to CMake(Output|Error).log


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51ce1aeba8bced872731e51b8911b97d08b2f5f7
commit 51ce1aeba8bced872731e51b8911b97d08b2f5f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 14 13:41:59 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 14 13:42:04 2013 -0400

    CXXFeatures: check for /Qstd=c++11 only with Intel on Windows
    
    The WIN32 condition is true for GNU compilers built for MinGW so
    narrow the condition to work only for the Intel compiler.

diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index 0f2fb9d..70a7deb 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -59,7 +59,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "(Borland|Watcom)")
     # No C++11 flag for those compilers, but check_cxx_compiler_flag()
     # can't detect because they either will not always complain (Borland)
     # or will hang (Watcom).
-elseif (WIN32)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND WIN32)
     # The Intel compiler on Windows may use these flags.
     test_set_flag("/Qstd=c++11" CXX11)
     if (NOT CXX11_COMPILER_FLAGS)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cabd6f87c048c5c63a5145652729606ec36612da
commit cabd6f87c048c5c63a5145652729606ec36612da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 14 13:39:08 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 14 13:39:08 2013 -0400

    CXXFeatures: log check outputs to CMake(Output|Error).log

diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index 294e19a..0f2fb9d 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -88,11 +88,13 @@ function(cxx_check_feature FEATURE_NAME)
     set(_SRCFILE_FAIL_COMPILE "${_SRCFILE_BASE}_fail_compile.cxx")
 
     try_compile(${RESULT_VAR} "${_bindir}" "${_SRCFILE}"
-                COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
+                COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}"
+                OUTPUT_VARIABLE _SRCFILE_COMPILE_PASS_OUTPUT)
 
     if (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL_COMPILE})
         try_compile(_TMP_RESULT "${_bindir}_fail_compile" "${_SRCFILE_FAIL_COMPILE}"
-                    COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")
+                    COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}"
+                    OUTPUT_VARIABLE _SRCFILE_COMPILE_FAIL_OUTPUT)
         if (_TMP_RESULT)
             set(${RESULT_VAR} FALSE)
         else ()
@@ -102,8 +104,16 @@ function(cxx_check_feature FEATURE_NAME)
 
     if (${RESULT_VAR})
         message(STATUS "Checking C++ support for ${_LOG_NAME}: works")
+        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+          "Checking C++ support for ${_LOG_NAME} passed.\n"
+          "Compile pass output:\n${_SRCFILE_COMPILE_PASS_OUTPUT}\n"
+          "Compile fail output:\n${_SRCFILE_COMPILE_FAIL_OUTPUT}\n")
     else ()
         message(STATUS "Checking C++ support for ${_LOG_NAME}: not supported")
+        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+          "Checking C++ support for ${_LOG_NAME} failed.\n"
+          "Compile pass output:\n${_SRCFILE_COMPILE_PASS_OUTPUT}\n"
+          "Compile fail output:\n${_SRCFILE_COMPILE_FAIL_OUTPUT}\n")
     endif ()
     set(${RESULT_VAR} "${${RESULT_VAR}}" CACHE INTERNAL "C++ support for ${_LOG_NAME}")
 endfunction(cxx_check_feature)

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

Summary of changes:
 Modules/FindCXXFeatures.cmake |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake