diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-10 13:03:41 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 13:36:57 (GMT) |
| commit | e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3 (patch) | |
| tree | deb78837ea052a24523fffdc8affd2c9a6899636 | |
| parent | 2afadb0d5ad21fbbcff961562ec441eb4ac001ab (diff) | |
| download | CMake-e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3.zip CMake-e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3.tar.gz CMake-e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3.tar.bz2 | |
Always cache entries through the cmake instance.
| -rw-r--r-- | Source/cmMakefile.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMarkAsAdvancedCommand.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c060505..7866c6b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1908,13 +1908,13 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value, 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); haveVal = true; } } - this->GetState()->AddCacheEntry(name, haveVal ? val.c_str() : 0, + this->GetCMakeInstance()->AddCacheEntry(name, haveVal ? val.c_str() : 0, doc, type); // if there was a definition then remove it this->StateSnapshot.RemoveDefinition(name); diff --git a/Source/cmMarkAsAdvancedCommand.cxx b/Source/cmMarkAsAdvancedCommand.cxx index 10d30f3..8d0e2b3 100644 --- a/Source/cmMarkAsAdvancedCommand.cxx +++ b/Source/cmMarkAsAdvancedCommand.cxx @@ -39,7 +39,8 @@ bool cmMarkAsAdvancedCommand cmState* state = this->Makefile->GetState(); if (!state->GetCacheEntryValue(variable)) { - state->AddCacheEntry(variable, 0, 0, cmState::UNINITIALIZED); + this->Makefile->GetCMakeInstance()->AddCacheEntry( + variable, 0, 0, cmState::UNINITIALIZED); overwrite = true; } if (!state->GetCacheEntryValue(variable)) |