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