diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-25 11:56:31 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 06:44:24 (GMT) |
commit | 9b244cc0ecff0cde22b71b7097a3d84c018c6044 (patch) | |
tree | 11775882a0fc5661344ea05f43505f29b76a6f8c | |
parent | def6da616b81958c9f1058a4e520ac3cbc534757 (diff) | |
download | CMake-9b244cc0ecff0cde22b71b7097a3d84c018c6044.zip CMake-9b244cc0ecff0cde22b71b7097a3d84c018c6044.tar.gz CMake-9b244cc0ecff0cde22b71b7097a3d84c018c6044.tar.bz2 |
cmLocalGenerator: Store imported targets in a separate container.
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 1 | ||||
-rw-r--r-- | Source/cmLocalGenerator.cxx | 5 | ||||
-rw-r--r-- | Source/cmLocalGenerator.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 47d254e..6b5cb97 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1606,6 +1606,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes, { cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg); this->GeneratorTargets[*j] = gt; + lg->AddImportedGeneratorTarget(gt); } } diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 9d5335e..1bc7f81 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -455,6 +455,11 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt) this->GeneratorTargets.push_back(gt); } +void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt) +{ + this->ImportedGeneratorTargets.push_back(gt); +} + struct NamedGeneratorTargetFinder { NamedGeneratorTargetFinder(std::string const& name) diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 91a476f..7841d05 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -121,6 +121,7 @@ public: } void AddGeneratorTarget(cmGeneratorTarget* gt); + void AddImportedGeneratorTarget(cmGeneratorTarget* gt); cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const; cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const; @@ -373,6 +374,7 @@ protected: std::set<cmGeneratorTarget const*> WarnCMP0063; std::vector<cmGeneratorTarget*> GeneratorTargets; + std::vector<cmGeneratorTarget*> ImportedGeneratorTargets; std::map<std::string, std::string> AliasTargets; bool EmitUniversalBinaryFlags; |