diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-29 20:59:16 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-29 20:59:16 (GMT) |
| commit | ccb77b65c673037780483e23c7bc1b4bf1d17cbc (patch) | |
| tree | 0cd149a96082da683a29bb31a6bfc0f60555e0d5 /Source/cmGlobalGenerator.cxx | |
| parent | 46f8ed064820ec7a9d645a55a1ad7a0d3d7b8134 (diff) | |
| download | CMake-ccb77b65c673037780483e23c7bc1b4bf1d17cbc.zip CMake-ccb77b65c673037780483e23c7bc1b4bf1d17cbc.tar.gz CMake-ccb77b65c673037780483e23c7bc1b4bf1d17cbc.tar.bz2 | |
ENH: unify version stuff, get rid of it out of cmake and cmMakefile and only use cmVersion
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 476ef92..71166a0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -18,6 +18,7 @@ #include "cmLocalGenerator.h" #include "cmake.h" #include "cmMakefile.h" +#include "cmVersion.h" #include <stdlib.h> // required for atof @@ -270,8 +271,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, // to avoid duplicate compiler tests. unsigned int cacheMajor = mf->GetCacheMajorVersion(); unsigned int cacheMinor = mf->GetCacheMinorVersion(); - unsigned int selfMajor = cmMakefile::GetMajorVersion(); - unsigned int selfMinor = cmMakefile::GetMinorVersion(); + unsigned int selfMajor = cmVersion::GetMajorVersion(); + unsigned int selfMinor = cmVersion::GetMinorVersion(); if((this->CMakeInstance->GetIsInTryCompile() || (selfMajor == cacheMajor && selfMinor == cacheMinor)) && !mf->GetDefinition(loadedLang.c_str())) |