diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-25 11:22:51 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 06:44:23 (GMT) |
commit | 0c97d32f7a592a768d614c19b3fd48eab245a2c4 (patch) | |
tree | 49164276c41a985b4217a2b1a46c46283fcdc368 /Source/cmMakefile.cxx | |
parent | 383bfd95432990365ac5c7fc3ab190bfb05cbec1 (diff) | |
download | CMake-0c97d32f7a592a768d614c19b3fd48eab245a2c4.zip CMake-0c97d32f7a592a768d614c19b3fd48eab245a2c4.tar.gz CMake-0c97d32f7a592a768d614c19b3fd48eab245a2c4.tar.bz2 |
cmGlobalGenerator: Remove direct storage of targets
Find the target by looping when needed.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3bf34e2..d9d773d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2096,7 +2096,6 @@ cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name) cmTarget& target = it->second; target.SetType(type, name); target.SetMakefile(this); - this->GetGlobalGenerator()->AddTarget(&it->second); return &it->second; } @@ -4183,15 +4182,11 @@ cmMakefile::AddImportedTarget(const std::string& name, // Create the target. cmsys::auto_ptr<cmTarget> target(new cmTarget); target->SetType(type, name); - target->MarkAsImported(); + target->MarkAsImported(global); target->SetMakefile(this); // Add to the set of available imported targets. this->ImportedTargets[name] = target.get(); - if(global) - { - this->GetGlobalGenerator()->AddTarget(target.get()); - } // Transfer ownership to this cmMakefile object. this->ImportedTargetsOwned.push_back(target.get()); |