summaryrefslogtreecommitdiff
path: root/Source/MFCDialog
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2001-05-01 16:34:53 -0400
committerKen Martin <ken.martin@kitware.com>2001-05-01 16:34:53 -0400
commit13d4fd06f09ad1beaab01d714c246dbee2568373 (patch)
tree91e52762c97b6147e1f698a8e53b6e542bceba46 /Source/MFCDialog
parented4f14fb4252b10db80ca8c6f04e427957ff8871 (diff)
downloadcmake-13d4fd06f09ad1beaab01d714c246dbee2568373.tar.gz
cache now loaded into makefile
Diffstat (limited to 'Source/MFCDialog')
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index a191a5ef2a..6277fe78a7 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