Create a cmGeneratorTarget for each cmTarget during generation

Construct the instances after the final set of targets is known but
before computing inter-target dependencies.  This order will allow
initialization of cmGeneratorTarget instances to adjust and finalize
declared inter-target dependencies.
This commit is contained in:
Brad King 2012-03-07 11:50:41 -05:00
parent 11d9b21126
commit 4b24558091
2 changed files with 57 additions and 0 deletions

View File

@ -24,6 +24,7 @@
#include "cmExportInstallFileGenerator.h" #include "cmExportInstallFileGenerator.h"
#include "cmComputeTargetDepends.h" #include "cmComputeTargetDepends.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include <cmsys/Directory.hxx> #include <cmsys/Directory.hxx>
@ -74,6 +75,7 @@ cmGlobalGenerator::~cmGlobalGenerator()
delete this->ExtraGenerator; delete this->ExtraGenerator;
} }
this->ClearGeneratorTargets();
this->ClearExportSets(); this->ClearExportSets();
} }
@ -807,6 +809,7 @@ bool cmGlobalGenerator::IsDependedOn(const char* project,
void cmGlobalGenerator::Configure() void cmGlobalGenerator::Configure()
{ {
this->FirstTimeProgress = 0.0f; this->FirstTimeProgress = 0.0f;
this->ClearGeneratorTargets();
this->ClearExportSets(); this->ClearExportSets();
// Delete any existing cmLocalGenerators // Delete any existing cmLocalGenerators
unsigned int i; unsigned int i;
@ -947,6 +950,9 @@ void cmGlobalGenerator::Generate()
this->LocalGenerators[i]->GenerateTargetManifest(); this->LocalGenerators[i]->GenerateTargetManifest();
} }
// Create per-target generator information.
this->CreateGeneratorTargets();
// Compute the inter-target dependencies. // Compute the inter-target dependencies.
if(!this->ComputeTargetDepends()) if(!this->ComputeTargetDepends())
{ {
@ -1056,6 +1062,47 @@ void cmGlobalGenerator::CreateAutomocTargets()
#endif #endif
} }
//----------------------------------------------------------------------------
void cmGlobalGenerator::CreateGeneratorTargets()
{
// Construct per-target generator information.
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
cmTargets& targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets();
for(cmTargets::iterator ti = targets.begin();
ti != targets.end(); ++ti)
{
cmTarget* t = &ti->second;
this->GeneratorTargets[t] = new cmGeneratorTarget(t);
}
}
}
//----------------------------------------------------------------------------
void cmGlobalGenerator::ClearGeneratorTargets()
{
for(GeneratorTargetsType::iterator i = this->GeneratorTargets.begin();
i != this->GeneratorTargets.end(); ++i)
{
delete i->second;
}
this->GeneratorTargets.clear();
}
//----------------------------------------------------------------------------
cmGeneratorTarget* cmGlobalGenerator::GetGeneratorTarget(cmTarget* t) const
{
GeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
if(ti == this->GeneratorTargets.end())
{
this->CMakeInstance->IssueMessage(
cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!",
cmListFileBacktrace());
return 0;
}
return ti->second;
}
void cmGlobalGenerator::CheckLocalGenerators() void cmGlobalGenerator::CheckLocalGenerators()
{ {

View File

@ -19,6 +19,7 @@
#include "cmTargetDepend.h" // For cmTargetDependSet #include "cmTargetDepend.h" // For cmTargetDependSet
#include "cmSystemTools.h" // for cmSystemTools::OutputOption #include "cmSystemTools.h" // for cmSystemTools::OutputOption
class cmake; class cmake;
class cmGeneratorTarget;
class cmMakefile; class cmMakefile;
class cmLocalGenerator; class cmLocalGenerator;
class cmExternalMakefileProjectGenerator; class cmExternalMakefileProjectGenerator;
@ -251,6 +252,9 @@ public:
// via a target_link_libraries or add_dependencies // via a target_link_libraries or add_dependencies
TargetDependSet const& GetTargetDirectDepends(cmTarget & target); TargetDependSet const& GetTargetDirectDepends(cmTarget & target);
/** Get per-target generator information. */
cmGeneratorTarget* GetGeneratorTarget(cmTarget*) const;
const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap() const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
const {return this->ProjectMap;} const {return this->ProjectMap;}
@ -370,6 +374,12 @@ private:
typedef std::map<cmTarget *, TargetDependSet> TargetDependMap; typedef std::map<cmTarget *, TargetDependSet> TargetDependMap;
TargetDependMap TargetDependencies; TargetDependMap TargetDependencies;
// Per-target generator information.
typedef std::map<cmTarget*, cmGeneratorTarget*> GeneratorTargetsType;
GeneratorTargetsType GeneratorTargets;
void CreateGeneratorTargets();
void ClearGeneratorTargets();
// Cache directory content and target files to be built. // Cache directory content and target files to be built.
struct DirectoryContent: public std::set<cmStdString> struct DirectoryContent: public std::set<cmStdString>
{ {