mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert topic 'refactor-cache-api'

Browse Source 
This topic was never tested without some follow-up commits.  The
GetCacheEntryValue API returns a pointer to memory freed on return.
It will have to be revised along with the rest of the original topic.
This commit is contained in:
Brad King
2015-04-07 17:14:41 -04:00
parent 9410e24a4a
commit 3347c5e4f9
29 changed files with 311 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLoadCacheCommand.cxx
View File

@@ -81,8 +81,8 @@ bool cmLoadCacheCommand
{
break;
}
this->Makefile->GetCMakeInstance()->LoadCache(args[i], false,
excludes, includes);
this->Makefile->GetCacheManager()->LoadCache(args[i], false,
excludes, includes);
}
@@ -173,7 +173,7 @@ void cmLoadCacheCommand::CheckLine(const char* line)
std::string var;
std::string value;
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
if(cmake::ParseCacheEntry(line, var, value, type))
if(cmCacheManager::ParseEntry(line, var, value, type))
{
// Found a real entry. See if this one was requested.
if(this->VariablesToRead.find(var) != this->VariablesToRead.end())