changed handling of FinalPass
This commit is contained in:
parent
44e4c7cd77
commit
d2c4432bbe
|
@ -70,6 +70,12 @@ void cmGlobalGenerator::Configure()
|
|||
|
||||
// now do it
|
||||
this->RecursiveConfigure(lg);
|
||||
|
||||
// after it is all done do a ConfigureFinalPass
|
||||
for (i = 0; i < m_LocalGenerators.size(); ++i)
|
||||
{
|
||||
m_LocalGenerators[i]->ConfigureFinalPass();
|
||||
}
|
||||
}
|
||||
|
||||
// loop through the directories creating cmLocalGenerators and Configure()
|
||||
|
@ -129,6 +135,7 @@ void cmGlobalGenerator::LocalGenerate()
|
|||
|
||||
// now do trhe configure
|
||||
lg->Configure();
|
||||
lg->ConfigureFinalPass();
|
||||
lg->Generate(false);
|
||||
delete lg;
|
||||
}
|
||||
|
|
|
@ -48,3 +48,8 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg)
|
|||
m_Makefile->SetHomeOutputDirectory(
|
||||
gg->GetCMakeInstance()->GetHomeOutputDirectory());
|
||||
}
|
||||
|
||||
void cmLocalGenerator::ConfigureFinalPass()
|
||||
{
|
||||
m_Makefile->ConfigureFinalPass();
|
||||
}
|
||||
|
|
|
@ -50,6 +50,11 @@ public:
|
|||
*/
|
||||
virtual void Configure();
|
||||
|
||||
/**
|
||||
* Perform any final calculations prior to generation
|
||||
*/
|
||||
virtual void ConfigureFinalPass();
|
||||
|
||||
///! Get the makefile for this generator
|
||||
cmMakefile *GetMakefile() {
|
||||
return this->m_Makefile; };
|
||||
|
|
Loading…
Reference in New Issue