[Cmake-commits] CMake branch, next, updated. v2.8.12-4489-gf42579a

[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  f42579a441a3c308afcca99edfb5a19f763d8a58 (commit)
       via  5b5944a261b4309b59cff2284abdc50f1fd08317 (commit)
      from  3ac6b030303c42ed7db0b6c3be82792963372a7b (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=f42579a441a3c308afcca99edfb5a19f763d8a58
commit f42579a441a3c308afcca99edfb5a19f763d8a58
Merge: 3ac6b03 5b5944a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 25 11:47:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 11:47:44 2013 -0400

    Merge topic 'target_compiler_features' into next
    
    5b5944a Fix the stderr output catcher.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b5944a261b4309b59cff2284abdc50f1fd08317
commit 5b5944a261b4309b59cff2284abdc50f1fd08317
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 25 17:46:55 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 25 17:46:55 2013 +0200

    Fix the stderr output catcher.

diff --git a/Modules/Compiler/CxxFeatureTesting.cmake b/Modules/Compiler/CxxFeatureTesting.cmake
index 0f4ee8c..5529814 100644
--- a/Modules/Compiler/CxxFeatureTesting.cmake
+++ b/Modules/Compiler/CxxFeatureTesting.cmake
@@ -17,13 +17,13 @@ macro(record_cxx_compiler_features compile_flags feature_list)
   string(REPLACE "<SOURCE>" "${CMAKE_CURRENT_BINARY_DIR}/feature_tests.cxx" _compile_object_command "${_compile_object_command}" )
   execute_process(COMMAND ${_compile_object_command}
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/CMakeFiles"
-    RESULT_VARIABLE _result
+    ERROR_VARIABLE _error
     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(_error)
   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}"

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

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


hooks/post-receive
-- 
CMake