[Cmake-commits] CMake branch, next, updated. v2.8.5-1434-ge5afff8

[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  e5afff8349c41063f5b6844b86240253ec9f923c (commit)
       via  8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19 (commit)
      from  6947e837f3b4298ae5db3a7bed51dbb7359e8943 (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=e5afff8349c41063f5b6844b86240253ec9f923c
commit e5afff8349c41063f5b6844b86240253ec9f923c
Merge: 6947e83 8ee9bbb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 15:39:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 4 15:39:46 2011 -0400

    Merge topic 'fix-imported-target-depend-crash' into next
    
    8ee9bbb Do not crash when an imported target depends on a missing target


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19
commit 8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 15:35:59 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 4 15:36:32 2011 -0400

    Do not crash when an imported target depends on a missing target
    
    Commit e01cce28 (Allow add_dependencies() on imported targets,
    2010-11-19) forgot to check if the dependee exists before using it.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index a4ca363..3a0ed06 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -276,9 +276,11 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmStdString>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      cmTarget* transitive_dependee =
-        dependee->GetMakefile()->FindTargetToUse(i->c_str());
-      this->AddTargetDepend(depender_index, transitive_dependee, false);
+      if(cmTarget* transitive_dependee =
+         dependee->GetMakefile()->FindTargetToUse(i->c_str()))
+        {
+        this->AddTargetDepend(depender_index, transitive_dependee, false);
+        }
       }
     }
   else

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

Summary of changes:
 Source/cmComputeTargetDepends.cxx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake