[Cmake-commits] CMake branch, next, updated. v2.8.12-4458-g48efe28

[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  48efe2847da6a017127706f90dff10115a68aa14 (commit)
       via  a9f1c6b4a04d7ccc21c1563701dbfd9cead4cd89 (commit)
      from  f37de7a02cb1b8d49cb7933b59b5796c70633867 (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=48efe2847da6a017127706f90dff10115a68aa14
commit 48efe2847da6a017127706f90dff10115a68aa14
Merge: f37de7a a9f1c6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 10:20:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 10:20:59 2013 -0400

    Merge topic 'target_compiler_features' into next
    
    a9f1c6b Capture process stdout and stderr.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9f1c6b4a04d7ccc21c1563701dbfd9cead4cd89
commit a9f1c6b4a04d7ccc21c1563701dbfd9cead4cd89
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 16:20:38 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 16:20:38 2013 +0200

    Capture process stdout and stderr.

diff --git a/Modules/Compiler/CxxFeatureTesting.cmake b/Modules/Compiler/CxxFeatureTesting.cmake
index ad85caf..e15ea21 100644
--- a/Modules/Compiler/CxxFeatureTesting.cmake
+++ b/Modules/Compiler/CxxFeatureTesting.cmake
@@ -15,7 +15,14 @@ macro(record_cxx_compiler_features compile_flags feature_list)
 
   execute_process(COMMAND "${CMAKE_CXX_COMPILER}" ${compile_flags} "-c" "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.cxx"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/CMakeFiles"
+    RESULT_VARIABLE _result
+    OUTPUT_VARIABLE _output
   )
+  # We need to capture these when running the process so that the output does
+  # not leak and confuse unit tests. Clear the variables so they do not leak
+  # to user CMake code either.
+  unset(_result)
+  unset(_output)
   if (EXISTS "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests${CMAKE_CXX_OUTPUT_EXTENSION}")
     file(STRINGS "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests${CMAKE_CXX_OUTPUT_EXTENSION}"
       features REGEX "CXX_FEATURE:.*")

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

Summary of changes:
 Modules/Compiler/CxxFeatureTesting.cmake |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake