[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-772-g19f831e

[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  19f831e636d7075445c506ce05cb075d7b8e5a02 (commit)
       via  8cc87a99b96dda61688eb430c48fd06da902faf0 (commit)
      from  352ef3970ebc3f30bb2bb04502d7db8206955da8 (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=19f831e636d7075445c506ce05cb075d7b8e5a02
commit 19f831e636d7075445c506ce05cb075d7b8e5a02
Merge: 352ef39 8cc87a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 1 13:45:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 1 13:45:51 2015 -0400

    Merge topic 'use-generator-target' into next
    
    8cc87a99 compile.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8cc87a99b96dda61688eb430c48fd06da902faf0
commit 8cc87a99b96dda61688eb430c48fd06da902faf0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 1 19:44:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 1 19:45:23 2015 +0200

    compile.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1301e3e..505929e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2895,10 +2895,11 @@ void cmGlobalXCodeGenerator
     }
 
   // Add dependencies on other CMake targets.
-  TargetDependSet const& deps = this->GetTargetDirectDepends(*cmtarget);
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
       {
       this->AddDependTarget(target, dptarget);
       }

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake