diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-07 20:04:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-07 20:04:05 (GMT) |
| commit | 678493d60ff0e8c8e59caf9fa57b6f1e5e7e61b2 (patch) | |
| tree | 46e9eedbc4f9fa3538116cc7011fee120c7c7e36 /Source/cmGetPropertyCommand.cxx | |
| parent | 7ee897beec045761e796ac7468ed6e43cd58f1fe (diff) | |
| parent | 9410e24a4ad3a21b2c27d057798f723e88d14d45 (diff) | |
| download | CMake-678493d60ff0e8c8e59caf9fa57b6f1e5e7e61b2.zip CMake-678493d60ff0e8c8e59caf9fa57b6f1e5e7e61b2.tar.gz CMake-678493d60ff0e8c8e59caf9fa57b6f1e5e7e61b2.tar.bz2 | |
Merge topic 'refactor-cache-api'
9410e24a cmCacheManager: Port consumers to non-iterator API.
7b7ae3b1 Port QtDialog to non-iterator cache API.
228c629c Port CursesDialog to non-iterator cache API.
2e50f5e7 cmMakefile: Port away from CacheEntry.Initialized.
e6224367 cmCacheManager: Add non-iterator-based API.
9ada4c04 cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue.
1fe7f24c Add API for cache loading, deleting and saving to the cmake class.
08c642c6 cmMakefile: Remove cache version accessors.
cec8f97e cmMakefile: Simplify GetDefinitions implementation.
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index f0b2686..0e6e0c2 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -391,11 +391,10 @@ bool cmGetPropertyCommand::HandleCacheMode() } const char* value = 0; - cmCacheManager::CacheIterator it = - this->Makefile->GetCacheManager()->GetCacheIterator(this->Name.c_str()); - if(!it.IsAtEnd()) + if(this->Makefile->GetCacheManager()->GetCacheEntryValue(this->Name)) { - value = it.GetProperty(this->PropertyName); + value = this->Makefile->GetCacheManager() + ->GetCacheEntryProperty(this->Name, this->PropertyName); } this->StoreResult(value); return true; |