diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-07 21:14:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-07 21:15:04 (GMT) |
| commit | 3347c5e4f9fcdd36c06067d6c7cd5a985a9c5d94 (patch) | |
| tree | d0372265c5b1f07f9b1a8a6cc9bedf96bed2dbcb /Source/cmVariableRequiresCommand.cxx | |
| parent | 9410e24a4ad3a21b2c27d057798f723e88d14d45 (diff) | |
| download | CMake-3347c5e4f9fcdd36c06067d6c7cd5a985a9c5d94.zip CMake-3347c5e4f9fcdd36c06067d6c7cd5a985a9c5d94.tar.gz CMake-3347c5e4f9fcdd36c06067d6c7cd5a985a9c5d94.tar.bz2 | |
Revert topic 'refactor-cache-api'
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.
Diffstat (limited to 'Source/cmVariableRequiresCommand.cxx')
| -rw-r--r-- | Source/cmVariableRequiresCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index dd2a682..80c1286 100644 --- a/Source/cmVariableRequiresCommand.cxx +++ b/Source/cmVariableRequiresCommand.cxx @@ -41,9 +41,9 @@ bool cmVariableRequiresCommand requirementsMet = false; notSet += args[i]; notSet += "\n"; - cmCacheManager* manager = this->Makefile->GetCacheManager(); - if(manager->GetCacheEntryValue(args[i]) && - manager->GetCacheEntryPropertyAsBool(args[i], "ADVANCED")) + cmCacheManager::CacheIterator it = + this->Makefile->GetCacheManager()->GetCacheIterator(args[i].c_str()); + if(!it.IsAtEnd() && it.GetPropertyAsBool("ADVANCED")) { hasAdvanced = true; } |