summaryrefslogtreecommitdiffstats
path: root/Source/cmCacheManager.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-11-29 20:59:16 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-11-29 20:59:16 (GMT)
commitccb77b65c673037780483e23c7bc1b4bf1d17cbc (patch)
tree0cd149a96082da683a29bb31a6bfc0f60555e0d5 /Source/cmCacheManager.cxx
parent46f8ed064820ec7a9d645a55a1ad7a0d3d7b8134 (diff)
downloadCMake-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/cmCacheManager.cxx')
-rw-r--r--Source/cmCacheManager.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 5eecb1d..c656a3c 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -20,6 +20,7 @@
#include "cmCacheManager.h"
#include "cmMakefile.h"
#include "cmake.h"
+#include "cmVersion.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
@@ -370,17 +371,17 @@ bool cmCacheManager::SaveCache(const char* path)
// before writing the cache, update the version numbers
// to the
char temp[1024];
- sprintf(temp, "%d", cmMakefile::GetMinorVersion());
+ sprintf(temp, "%d", cmVersion::GetMinorVersion());
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", temp,
"Minor version of cmake used to create the "
"current loaded cache", cmCacheManager::INTERNAL);
- sprintf(temp, "%d", cmMakefile::GetMajorVersion());
+ sprintf(temp, "%d", cmVersion::GetMajorVersion());
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", temp,
"Major version of cmake used to create the "
"current loaded cache", cmCacheManager::INTERNAL);
this->AddCacheEntry("CMAKE_CACHE_RELEASE_VERSION",
- cmMakefile::GetReleaseVersion(),
+ cmVersion::GetReleaseVersion().c_str(),
"Major version of cmake used to create the "
"current loaded cache", cmCacheManager::INTERNAL);