[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5605-g8d7281e

[Stephen Kelly]

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  8d7281e658faffd529561dde90aecf10c70001b4 (commit)
       via  aa29e64d77504a50cb8fe6ef5c7d2642170ea07f (commit)
      from  e3977d611d579a61e8fa160aad858d3b026cda40 (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=8d7281e658faffd529561dde90aecf10c70001b4
commit 8d7281e658faffd529561dde90aecf10c70001b4
Merge: e3977d6 aa29e64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 07:22:06 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 07:22:06 2013 -0500

    Merge topic 'use-generator-target' into next
    
    aa29e64 Add a null check to the generator target accessor.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa29e64d77504a50cb8fe6ef5c7d2642170ea07f
commit aa29e64d77504a50cb8fe6ef5c7d2642170ea07f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 10 21:29:57 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 13:21:43 2013 +0100

    Add a null check to the generator target accessor.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ac8381c..360b3d9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4061,8 +4061,11 @@ bool cmMakefile::IsAlias(const char *name)
 //----------------------------------------------------------------------------
 cmGeneratorTarget* cmMakefile::FindGeneratorTargetToUse(const char* name)
 {
-  cmTarget *t = this->FindTargetToUse(name);
-  return this->LocalGenerator->GetGlobalGenerator()->GetGeneratorTarget(t);
+  if (cmTarget *t = this->FindTargetToUse(name))
+    {
+    return this->LocalGenerator->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:


hooks/post-receive
-- 
CMake