[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5939-g8318c93

[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  8318c9347c4f6217556e32f0105358d55fa20257 (commit)
       via  02a545c534d86652595cd282b10cb9ed9fad6239 (commit)
      from  8977fe1ab8170d4eb51b48afe30cdfb639ebc6f0 (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=8318c9347c4f6217556e32f0105358d55fa20257
commit 8318c9347c4f6217556e32f0105358d55fa20257
Merge: 8977fe1 02a545c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 29 07:00:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 29 07:00:38 2013 -0500

    Merge topic 'use-generator-target' into next
    
    02a545c Don't generate subdir convenience rules for IMPORTED targets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02a545c534d86652595cd282b10cb9ed9fad6239
commit 02a545c534d86652595cd282b10cb9ed9fad6239
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 29 01:33:53 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 29 12:57:24 2013 +0100

    Don't generate subdir convenience rules for IMPORTED targets.
    
    This was missing from commit c34968a9 (Port some of the generator
    API to cmGeneratorTarget., 2012-10-10). The generator targets
    stored with the cmMakefile include IMPORTED targets, unlike the
    accessor for resgular targets. Before this patch, rules would
    be generated for Qt5::Core for example, which result in broken
    makefiles.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9af5c29..df5da5d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -390,6 +390,11 @@ void cmLocalUnixMakefileGenerator3
        (t->second->GetType() == cmTarget::INTERFACE_LIBRARY) ||
        (t->second->GetType() == cmTarget::UTILITY))
       {
+      if (t->second->Target->IsImported())
+        {
+        continue;
+        }
+
       emitted.insert(t->second->GetName());
 
       // for subdirs add a rule to build this specific target by name.

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

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


hooks/post-receive
-- 
CMake