diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-12 14:26:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-12 14:26:18 (GMT) |
| commit | 83d2b6f378ddb462a105c2754f0b061f31709655 (patch) | |
| tree | 67399b8fb06701cd6fd8ea3f1f7d78665aa92dfa /Source/cmMakefile.cxx | |
| parent | 762108f3ec60ca717cdba369dffc84459a7e3282 (diff) | |
| parent | 79a309d786abefef1a4f354c2973a14cba882850 (diff) | |
| download | CMake-83d2b6f378ddb462a105c2754f0b061f31709655.zip CMake-83d2b6f378ddb462a105c2754f0b061f31709655.tar.gz CMake-83d2b6f378ddb462a105c2754f0b061f31709655.tar.bz2 | |
Merge topic 'refactor-cache-manager'
79a309d7 cmState: Port away from cmake instance.
e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager.
b5212c68 cmState: Add API for cache version.
95b0d761 cmState: Externalize logic to caller.
6f02034e cmState: Make AddCacheEntry method private.
435a2f3c cmCacheManager: Port away from cmake instance.
062ed22e cmState: Add cache file manipulation wrappers.
a02e53eb Inline unary LoadCache.
bec3487f cmCacheManager: Remove cmMakefile dependency.
e0f740f1 Always cache entries through the cmake instance.
2afadb0d cmake: Port away from trivial cmCacheManager use.
3d8c299f cmake: Use existing cache API wrapper.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d3152cd..73d3522 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1905,13 +1905,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); |