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/cmUtilitySourceCommand.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/cmUtilitySourceCommand.cxx')
| -rw-r--r-- | Source/cmUtilitySourceCommand.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx index 2799a9b..ee1ff29 100644 --- a/Source/cmUtilitySourceCommand.cxx +++ b/Source/cmUtilitySourceCommand.cxx @@ -52,13 +52,11 @@ bool cmUtilitySourceCommand } else { - cmCacheManager *manager = - this->Makefile->GetCMakeInstance()->GetCacheManager(); haveCacheValue = (cacheValue && (strstr(cacheValue, "(IntDir)") == 0 || (intDir && strcmp(intDir, "$(IntDir)") == 0)) && - (manager->GetCacheMajorVersion() != 0 && - manager->GetCacheMinorVersion() != 0 )); + (this->Makefile->GetCacheMajorVersion() != 0 && + this->Makefile->GetCacheMinorVersion() != 0 )); } if(haveCacheValue) |