diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-06 11:32:00 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-06 15:58:54 (GMT) |
| commit | 08c642c6ae47fd075fe1060fc0e28d8a24cc3c00 (patch) | |
| tree | c4887cdd0e1991d8833923ddfdad7dd7986dbfd8 /Source/cmUtilitySourceCommand.cxx | |
| parent | cec8f97e5717fac279d310f3f0b9e849a0e59706 (diff) | |
| download | CMake-08c642c6ae47fd075fe1060fc0e28d8a24cc3c00.zip CMake-08c642c6ae47fd075fe1060fc0e28d8a24cc3c00.tar.gz CMake-08c642c6ae47fd075fe1060fc0e28d8a24cc3c00.tar.bz2 | |
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 ee1ff29..2799a9b 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) |