summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-11-29 00:33:53 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-11-29 11:57:24 (GMT)
commit02a545c534d86652595cd282b10cb9ed9fad6239 (patch)
tree03e624bc1bd815bc326b3bf20b3cfd71cc3cb65b /Source
parenta60cd3d3c6b214a2c1271321c726fd21000a0cdb (diff)
downloadCMake-02a545c534d86652595cd282b10cb9ed9fad6239.zip
CMake-02a545c534d86652595cd282b10cb9ed9fad6239.tar.gz
CMake-02a545c534d86652595cd282b10cb9ed9fad6239.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx5
1 files changed, 5 insertions, 0 deletions
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.