[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7025-gde359a4

[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  de359a42f708af365095538faac940acd7812f33 (commit)
       via  954376beec026a0afff595c24e02e5dc59674cbb (commit)
      from  c34122dd32d7f0d9c3ca37712cbb309f7984fe04 (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=de359a42f708af365095538faac940acd7812f33
commit de359a42f708af365095538faac940acd7812f33
Merge: c34122d 954376b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 05:20:23 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 11 05:20:23 2014 -0500

    Merge topic 'use-generator-target' into next
    
    954376b Attempt mac fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=954376beec026a0afff595c24e02e5dc59674cbb
commit 954376beec026a0afff595c24e02e5dc59674cbb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 11:20:01 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 11 11:20:01 2014 +0100

    Attempt mac fix.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 26e5c2a..2687827 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2788,7 +2788,11 @@ void cmGlobalXCodeGenerator
     }
 
   // Add dependencies on other CMake targets.
-  TargetDependSet const& deps = this->GetTargetDirectDepends(*cmtarget);
+
+  cmGeneratorTarget const* gtgt = cmtarget->GetMakefile()->GetLocalGenerator()
+                                    ->GetGlobalGenerator()
+                                    ->GetGeneratorTarget(cmtarget);
+  TargetDependSet const& deps = this->GetTargetDirectDepends(*gtgt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
     if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index a9a27b9..248b5b9 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -49,11 +49,15 @@ void cmLocalXCodeGenerator::Generate()
 {
   cmLocalGenerator::Generate();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  const cmGeneratorTargetsType &targets =
+                                        this->Makefile->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::const_iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
+    if (l->first->IsImported())
+      {
+      continue;
+      }
     t->HasMacOSXRpathInstallNameDir(NULL);
     }
 }
@@ -63,11 +67,16 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
 {
   cmLocalGenerator::GenerateInstallRules();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  const cmGeneratorTargetsType &targets =
+                                        this->Makefile->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::const_iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
+    if (iter->first->IsImported())
+      {
+      continue;
+      }
+    cmGeneratorTarget* t = iter->second;
     t->HasMacOSXRpathInstallNameDir(NULL);
     }
 }

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    6 +++++-
 Source/cmLocalXCodeGenerator.cxx  |   21 +++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake