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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 78cc848..d230add 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -15,7 +15,7 @@ =========================================================================*/ #include "cmMakefile.h" - +#include "cmVersion.h" #include "cmCommand.h" #include "cmSourceFile.h" #include "cmSystemTools.h" @@ -133,23 +133,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf) this->ListFileStack = mf.ListFileStack; } -const char* cmMakefile::GetReleaseVersion() -{ -#if CMake_VERSION_MINOR & 1 - return "development"; -#else -# if CMake_VERSION_PATCH == 1 - return "1-beta"; -# else -# ifdef CMake_VERSION_RC - return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH) " RC-" - CMAKE_TO_STRING(CMake_VERSION_RC); -# else - return "patch " CMAKE_TO_STRING(CMake_VERSION_PATCH); -# endif -# endif -#endif -} unsigned int cmMakefile::GetCacheMajorVersion() { @@ -1965,11 +1948,11 @@ void cmMakefile::AddDefaultDefinitions() #endif char temp[1024]; - sprintf(temp, "%d", cmMakefile::GetMinorVersion()); + sprintf(temp, "%d", cmVersion::GetMinorVersion()); this->AddDefinition("CMAKE_MINOR_VERSION", temp); - sprintf(temp, "%d", cmMakefile::GetMajorVersion()); + sprintf(temp, "%d", cmVersion::GetMajorVersion()); this->AddDefinition("CMAKE_MAJOR_VERSION", temp); - sprintf(temp, "%d", cmMakefile::GetPatchVersion()); + sprintf(temp, "%d", cmVersion::GetPatchVersion()); this->AddDefinition("CMAKE_PATCH_VERSION", temp); this->AddDefinition("CMAKE_FILES_DIRECTORY", |