kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cache now loaded into makefile

This commit is contained in:
Ken Martin 2001-05-01 16:34:53 -04:00
parent ed4f14fb42
commit 13d4fd06f0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -341,10 +341,10 @@ void CMakeSetupDialog::OnBuildProjects()
// current GUI values to the cache // current GUI values to the cache
this->SaveCacheFromGUI(); this->SaveCacheFromGUI();
} }
// Make sure we are working from the cache on disk
this->LoadCacheFromDiskToGUI();
// Create a makefile object // Create a makefile object
cmMakefile makefile; cmMakefile makefile;
// Make sure we are working from the cache on disk
this->LoadCacheFromDiskToGUI();
makefile.SetMakefileGenerator(new cmMSProjectGenerator); makefile.SetMakefileGenerator(new cmMSProjectGenerator);
makefile.SetHomeDirectory(m_WhereSource); makefile.SetHomeDirectory(m_WhereSource);
makefile.SetStartOutputDirectory(m_WhereBuild); makefile.SetStartOutputDirectory(m_WhereBuild);
@ -361,6 +361,7 @@ void CMakeSetupDialog::OnBuildProjects()
// update the GUI with any new values in the caused by the // update the GUI with any new values in the caused by the
// generation process // generation process
this->LoadCacheFromDiskToGUI(); this->LoadCacheFromDiskToGUI();
cmCacheManager::GetInstance()->DefineCache(&makefile);
// save source and build paths to registry // save source and build paths to registry
this->SaveToRegistry(); this->SaveToRegistry();
// path is not up-to-date // path is not up-to-date

1
Source/cmMakefile.cxx
View File

@ -63,6 +63,7 @@ cmMakefile::cmMakefile()
this->AddSourceGroup("Header Files", "\\.(h|hh|hpp|hxx|hm|inl)$"); this->AddSourceGroup("Header Files", "\\.(h|hh|hpp|hxx|hm|inl)$");
this->AddDefaultCommands(); this->AddDefaultCommands();
this->AddDefaultDefinitions(); this->AddDefaultDefinitions();
cmCacheManager::GetInstance()->DefineCache(this);
} }
void cmMakefile::AddDefaultCommands() void cmMakefile::AddDefaultCommands()