[Cmake-commits] CMake branch, master, updated. v3.2.2-1078-g06d0cd5

Brad King brad.king at kitware.com
Fri May 8 09:41:19 EDT 2015


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, master has been updated
       via  06d0cd53f2c0c1baa274626101d053a9078c83a0 (commit)
       via  f65bb82f3688ba33faccf2ef0690571e1aa6edc2 (commit)
      from  ee15acd8273d49672745aa988819ff8c564e94bc (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=06d0cd53f2c0c1baa274626101d053a9078c83a0
commit 06d0cd53f2c0c1baa274626101d053a9078c83a0
Merge: ee15acd f65bb82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 09:41:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 09:41:18 2015 -0400

    Merge topic 'execute_process-merge-output'
    
    f65bb82f execute_process: Improve stdout/stderr merging


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

Summary of changes:
 Help/command/execute_process.rst                   |    3 ++-
 Help/release/dev/execute_process-merge-output.rst  |    5 ++++
 Source/cmExecuteProcessCommand.cxx                 |   24 ++++++++++++++++----
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../execute_process/MergeOutput-stdout.txt         |   10 ++++++++
 Tests/RunCMake/execute_process/MergeOutput.cmake   |    4 ++++
 .../execute_process/MergeOutputFile-stderr.txt     |   10 ++++++++
 .../RunCMake/execute_process/MergeOutputFile.cmake |    7 ++++++
 .../execute_process/MergeOutputVars-stderr.txt     |   10 ++++++++
 .../RunCMake/execute_process/MergeOutputVars.cmake |    6 +++++
 Tests/RunCMake/execute_process/RunCMakeTest.cmake  |    8 +++++++
 11 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/execute_process-merge-output.rst
 create mode 100644 Tests/RunCMake/execute_process/MergeOutput-stdout.txt
 create mode 100644 Tests/RunCMake/execute_process/MergeOutput.cmake
 create mode 100644 Tests/RunCMake/execute_process/MergeOutputFile-stderr.txt
 create mode 100644 Tests/RunCMake/execute_process/MergeOutputFile.cmake
 create mode 100644 Tests/RunCMake/execute_process/MergeOutputVars-stderr.txt
 create mode 100644 Tests/RunCMake/execute_process/MergeOutputVars.cmake
 create mode 100644 Tests/RunCMake/execute_process/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list