From d2c4432bbe6348c5f14caf6b5d361dcd22ee08be Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Sun, 15 Sep 2002 08:54:16 -0400 Subject: changed handling of FinalPass --- Source/cmGlobalGenerator.cxx | 7 +++++++ Source/cmLocalGenerator.cxx | 5 +++++ Source/cmLocalGenerator.h | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 5030e7e..3bb4082 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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; } diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 8560cdd..99fe4b7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -48,3 +48,8 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg) m_Makefile->SetHomeOutputDirectory( gg->GetCMakeInstance()->GetHomeOutputDirectory()); } + +void cmLocalGenerator::ConfigureFinalPass() +{ + m_Makefile->ConfigureFinalPass(); +} diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b313dc7..f63d09a 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -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; }; -- cgit v0.12