mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-25 10:18:34 -06:00
BUG#129: Fixed load/save of CMakeCache.txt when it is not in the current directory.
This commit is contained in:
@@ -639,8 +639,7 @@ int cmCursesMainForm::Configure(int noconfigure)
|
||||
// always save the current gui values to disk
|
||||
this->FillCacheManagerFromUI();
|
||||
this->m_CMakeInstance->GetCacheManager()->SaveCache(
|
||||
cmSystemTools::GetCurrentWorkingDirectory().c_str());
|
||||
|
||||
m_CMakeInstance->GetHomeOutputDirectory());
|
||||
|
||||
// Get rid of previous errors
|
||||
m_Errors = std::vector<std::string>();
|
||||
|
||||
@@ -116,8 +116,7 @@ void cmakewizard::RunWizard(std::vector<std::string> const& args)
|
||||
this->ShowMessage("\n");
|
||||
// load the cache from disk
|
||||
cmCacheManager *cachem = make.GetCacheManager();
|
||||
cachem->
|
||||
LoadCache(cmSystemTools::GetCurrentWorkingDirectory().c_str());
|
||||
cachem->LoadCache(make.GetHomeOutputDirectory());
|
||||
cmCacheManager::CacheIterator i = cachem->NewIterator();
|
||||
// iterate over all entries in the cache
|
||||
for(;!i.IsAtEnd(); i.Next())
|
||||
@@ -151,7 +150,7 @@ void cmakewizard::RunWizard(std::vector<std::string> const& args)
|
||||
}
|
||||
askedCache[key] = i.GetValue();
|
||||
}
|
||||
cachem->SaveCache(cmSystemTools::GetCurrentWorkingDirectory().c_str());
|
||||
cachem->SaveCache(make.GetHomeOutputDirectory());
|
||||
}
|
||||
while(asked);
|
||||
make.Generate();
|
||||
|
||||
Reference in New Issue
Block a user