diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-06 13:32:00 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-07 23:25:35 +0200 |
| commit | 1f2c12ebd196f3d23aa40d85c965654dbc36d0ad (patch) | |
| tree | cf7bc91447ecfe4dfe87f95156e86ef0cc5803f6 /Source/cmUtilitySourceCommand.cxx | |
| parent | 97c50a8dbd9f1ca5026f60e4a224e9a087e01f0e (diff) | |
| download | cmake-1f2c12ebd196f3d23aa40d85c965654dbc36d0ad.tar.gz | |
cmMakefile: Remove cache version accessors.
They are only used by legacy code. Inline them there to simplify
cmMakefile.
Diffstat (limited to 'Source/cmUtilitySourceCommand.cxx')
| -rw-r--r-- | Source/cmUtilitySourceCommand.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx index ee1ff291ac..2799a9be5a 100644 --- a/Source/cmUtilitySourceCommand.cxx +++ b/Source/cmUtilitySourceCommand.cxx @@ -52,11 +52,13 @@ bool cmUtilitySourceCommand } else { + cmCacheManager *manager = + this->Makefile->GetCMakeInstance()->GetCacheManager(); haveCacheValue = (cacheValue && (strstr(cacheValue, "(IntDir)") == 0 || (intDir && strcmp(intDir, "$(IntDir)") == 0)) && - (this->Makefile->GetCacheMajorVersion() != 0 && - this->Makefile->GetCacheMinorVersion() != 0 )); + (manager->GetCacheMajorVersion() != 0 && + manager->GetCacheMinorVersion() != 0 )); } if(haveCacheValue) |