[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1809-ge1c681b

[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, next has been updated
       via  e1c681ba59f170b4062b02535a564a3a0ff1613e (commit)
       via  c4059a21a9935f376d243f3526f8635800146e77 (commit)
      from  9e9563f75a71a849c5071f04f042f57916dcb9fc (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=e1c681ba59f170b4062b02535a564a3a0ff1613e
commit e1c681ba59f170b4062b02535a564a3a0ff1613e
Merge: 9e9563f c4059a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 3 14:19:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 14:19:33 2014 -0400

    Merge topic 'remove-stray-aborts' into next
    
    c4059a21 cmTarget: Remove abort() after INTERNAL_ERROR reports


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4059a21a9935f376d243f3526f8635800146e77
commit c4059a21a9935f376d243f3526f8635800146e77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 3 14:04:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 3 14:05:03 2014 -0400

    cmTarget: Remove abort() after INTERNAL_ERROR reports
    
    After reporting an internal error we should continue rather than
    aborting.  Remove such statements that are left from debugging.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a87ec31..b6bb2d3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2684,7 +2684,6 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
     msg += " which has type ";
     msg += cmTarget::GetTargetTypeName(this->GetType());
     this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg);
-    abort();
     return 0;
     }
 
@@ -2729,7 +2728,6 @@ cmTarget::CompileInfo const* cmTarget::GetCompileInfo(
     msg += " which has type ";
     msg += cmTarget::GetTargetTypeName(this->GetType());
     this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg);
-    abort();
     return 0;
     }
 

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

Summary of changes:
 Source/cmTarget.cxx |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake