[Cmake-commits] CMake branch, master, updated. v3.6.1-891-g85bfec7

[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, master has been updated
       via  85bfec7572f84ba259e0eabe383f6dcb0bd45d9b (commit)
       via  f1ad71d7f8c066a7e0d0c11bb1ce9d5a5719ec5e (commit)
      from  4469e986ee2189378f9054231b796249e6db54e1 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85bfec7572f84ba259e0eabe383f6dcb0bd45d9b
commit 85bfec7572f84ba259e0eabe383f6dcb0bd45d9b
Merge: 4469e98 f1ad71d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 7 09:48:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 7 09:48:32 2016 -0400

    Merge topic 'fix-continue-after-error'
    
    f1ad71d7 cmMakefile: Restore nested error logic use of cmExecutionStatus


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

Summary of changes:
 Source/cmExecutionStatus.h                          |    4 ++++
 Source/cmFunctionCommand.cxx                        |    6 +++---
 Source/cmMacroCommand.cxx                           |    4 ++--
 Source/cmMakefile.cxx                               |   19 ++++++++-----------
 .../ContinueAfterError-result.txt}                  |    0
 .../Configure/ContinueAfterError-stderr.txt         |   13 +++++++++++++
 .../Configure/ContinueAfterError-stdout.txt         |   11 +++++++++++
 Tests/RunCMake/Configure/ContinueAfterError.cmake   |   19 +++++++++++++++++++
 Tests/RunCMake/Configure/RunCMakeTest.cmake         |    1 +
 9 files changed, 61 insertions(+), 16 deletions(-)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => Configure/ContinueAfterError-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Configure/ContinueAfterError-stderr.txt
 create mode 100644 Tests/RunCMake/Configure/ContinueAfterError-stdout.txt
 create mode 100644 Tests/RunCMake/Configure/ContinueAfterError.cmake


hooks/post-receive
-- 
CMake