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

Always cache entries through the cmake instance.

This commit is contained in:
Stephen Kelly 2015-10-10 15:03:41 +02:00
parent 2afadb0d5a
commit e0f740f1b1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -1908,13 +1908,13 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
nvalue += files[cc]; nvalue += files[cc];
} }
this->GetState()->AddCacheEntry(name, nvalue.c_str(), doc, type); this->GetCMakeInstance()->AddCacheEntry(name, nvalue.c_str(), doc, type);
val = this->GetState()->GetInitializedCacheValue(name); val = this->GetState()->GetInitializedCacheValue(name);
haveVal = true; haveVal = true;
} }
} }
this->GetState()->AddCacheEntry(name, haveVal ? val.c_str() : 0, this->GetCMakeInstance()->AddCacheEntry(name, haveVal ? val.c_str() : 0,
doc, type); doc, type);
// if there was a definition then remove it // if there was a definition then remove it
this->StateSnapshot.RemoveDefinition(name); this->StateSnapshot.RemoveDefinition(name);

3
Source/cmMarkAsAdvancedCommand.cxx
View File

@ -39,7 +39,8 @@ bool cmMarkAsAdvancedCommand
cmState* state = this->Makefile->GetState(); cmState* state = this->Makefile->GetState();
if (!state->GetCacheEntryValue(variable)) if (!state->GetCacheEntryValue(variable))
{ {
state->AddCacheEntry(variable, 0, 0, cmState::UNINITIALIZED); this->Makefile->GetCMakeInstance()->AddCacheEntry(
variable, 0, 0, cmState::UNINITIALIZED);
overwrite = true; overwrite = true;
} }
if (!state->GetCacheEntryValue(variable)) if (!state->GetCacheEntryValue(variable))