diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-07-25 22:30:27 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-07-25 22:30:27 (GMT) |
| commit | a5eac44d1833c80ce82dad9331418f1119582f3b (patch) | |
| tree | b42d695d47580684a1b8a92785d5870921bb6273 /Source/cmMakefile.cxx | |
| parent | 4ab2650802f7b0addce7860aff4fd5a2709eae24 (diff) | |
| download | CMake-a5eac44d1833c80ce82dad9331418f1119582f3b.zip CMake-a5eac44d1833c80ce82dad9331418f1119582f3b.tar.gz CMake-a5eac44d1833c80ce82dad9331418f1119582f3b.tar.bz2 | |
ENH: rework GUI with configure/OK/Cancel
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3fc0d96..5c8aad2 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -404,8 +404,7 @@ void cmMakefile::SetMakefileGenerator(cmMakefileGenerator* mf) mf->SetMakefile(this); } - // Generate the output file -void cmMakefile::GenerateMakefile() +void cmMakefile::FinalPass() { // do all the variable expansions here this->ExpandVariables(); @@ -416,6 +415,13 @@ void cmMakefile::GenerateMakefile() { (*i)->FinalPass(); } + +} + + // Generate the output file +void cmMakefile::GenerateMakefile() +{ + this->FinalPass(); // merge libraries for (cmTargets::iterator l = m_Targets.begin(); l != m_Targets.end(); l++) |