summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-09-15 12:54:16 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-09-15 12:54:16 (GMT)
commitd2c4432bbe6348c5f14caf6b5d361dcd22ee08be (patch)
treecab77a7857f6af951ec10e2ebb46324c409fa930
parent44e4c7cd772d7e3a78a1a83fe4629026e70d3c4c (diff)
downloadCMake-d2c4432bbe6348c5f14caf6b5d361dcd22ee08be.zip
CMake-d2c4432bbe6348c5f14caf6b5d361dcd22ee08be.tar.gz
CMake-d2c4432bbe6348c5f14caf6b5d361dcd22ee08be.tar.bz2
changed handling of FinalPass
-rw-r--r--Source/cmGlobalGenerator.cxx7
-rw-r--r--Source/cmLocalGenerator.cxx5
-rw-r--r--Source/cmLocalGenerator.h5
3 files changed, 17 insertions, 0 deletions
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; };