[Cmake-commits] CMake branch, next, updated. v2.8.9-1167-gb2bffb4

[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  b2bffb446bf890ab401bb31c206e5d1b8bcab6f0 (commit)
       via  db9bba626b0040e35817d1815732bfa3a913c749 (commit)
      from  38b0807432d9eba62991d663d002fb2afcd70e77 (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=b2bffb446bf890ab401bb31c206e5d1b8bcab6f0
commit b2bffb446bf890ab401bb31c206e5d1b8bcab6f0
Merge: 38b0807 db9bba6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 17:54:52 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 19 17:54:52 2012 -0400

    Merge topic 'genex-validate-target-property-names' into next
    
    db9bba6 Skip imported targets when iterating over cmGeneratorTargets


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db9bba626b0040e35817d1815732bfa3a913c749
commit db9bba626b0040e35817d1815732bfa3a913c749
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 23:25:10 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 19 23:54:15 2012 +0200

    Skip imported targets when iterating over cmGeneratorTargets
    
    The GetGeneratorTargets result now includes IMPORTED targets where it
    didn't before. The GetTargets result, which was what used to be
    called in these methods does not include IMPORTED targets.
    
    This doesn't relate to any known bugs, but in some future uses of
    GetGeneratorTargets it will be important, so starting the convention
    and being deliberate now is a good idea.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 689f213..96b8a09 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -889,6 +889,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
+      if (l->first->IsImported())
+        {
+        continue;
+        }
       std::vector<std::string> includeDirs;
       const char *config = mf->GetDefinition("CMAKE_BUILD_TYPE");
       (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 4f4f725..4952a8c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -745,6 +745,10 @@ void cmLocalGenerator
   for(cmGeneratorTargetsType::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
+    if (l->first->IsImported())
+      {
+      continue;
+      }
     cmGeneratorTarget& target = *l->second;
     switch(target.GetType())
       {

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    4 ++++
 Source/cmLocalGenerator.cxx            |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake