[Cmake-commits] CMake branch, master, updated. v3.0.0-1587-gbd64227

[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  bd642272b9d9876277a318d3a861d5946a043c43 (commit)
       via  b2282631f61361fe5f103fa7479073f2693eafcb (commit)
      from  c1560296db63f4021f6f9e38e3280fad13db9812 (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=bd642272b9d9876277a318d3a861d5946a043c43
commit bd642272b9d9876277a318d3a861d5946a043c43
Merge: c156029 b228263
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 09:17:41 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 31 09:17:41 2014 -0400

    Merge topic 'fix-CMP0049-extra-error'
    
    b2282631 cmTarget: Do not mistake a preceding error for a CMP0049 failure


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

Summary of changes:
 Source/cmTarget.cxx                                        |   12 +++++++-----
 .../CustomTargetAfterError-result.txt}                     |    0
 Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt |    9 +++++++++
 Tests/RunCMake/Configure/CustomTargetAfterError.cmake      |    3 +++
 Tests/RunCMake/Configure/RunCMakeTest.cmake                |    1 +
 5 files changed, 20 insertions(+), 5 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Configure/CustomTargetAfterError-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Configure/CustomTargetAfterError-stderr.txt
 create mode 100644 Tests/RunCMake/Configure/CustomTargetAfterError.cmake


hooks/post-receive
-- 
CMake