diff options
| author | Ken Martin <ken.martin@kitware.com> | 2001-05-01 20:34:53 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2001-05-01 20:34:53 (GMT) |
| commit | 13d4fd06f09ad1beaab01d714c246dbee2568373 (patch) | |
| tree | 91e52762c97b6147e1f698a8e53b6e542bceba46 | |
| parent | ed4f14fb4252b10db80ca8c6f04e427957ff8871 (diff) | |
| download | CMake-13d4fd06f09ad1beaab01d714c246dbee2568373.zip CMake-13d4fd06f09ad1beaab01d714c246dbee2568373.tar.gz CMake-13d4fd06f09ad1beaab01d714c246dbee2568373.tar.bz2 | |
cache now loaded into makefile
| -rw-r--r-- | Source/MFCDialog/CMakeSetupDialog.cpp | 5 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp index a191a5e..6277fe7 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -341,10 +341,10 @@ void CMakeSetupDialog::OnBuildProjects() // current GUI values to the cache this->SaveCacheFromGUI(); } - // Make sure we are working from the cache on disk - this->LoadCacheFromDiskToGUI(); // Create a makefile object cmMakefile makefile; + // Make sure we are working from the cache on disk + this->LoadCacheFromDiskToGUI(); makefile.SetMakefileGenerator(new cmMSProjectGenerator); makefile.SetHomeDirectory(m_WhereSource); makefile.SetStartOutputDirectory(m_WhereBuild); @@ -361,6 +361,7 @@ void CMakeSetupDialog::OnBuildProjects() // update the GUI with any new values in the caused by the // generation process this->LoadCacheFromDiskToGUI(); + cmCacheManager::GetInstance()->DefineCache(&makefile); // save source and build paths to registry this->SaveToRegistry(); // path is not up-to-date diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 11d0a26..d706d46 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -63,6 +63,7 @@ cmMakefile::cmMakefile() this->AddSourceGroup("Header Files", "\\.(h|hh|hpp|hxx|hm|inl)$"); this->AddDefaultCommands(); this->AddDefaultDefinitions(); + cmCacheManager::GetInstance()->DefineCache(this); } void cmMakefile::AddDefaultCommands() |