diff options
| author | Brad King <brad.king@kitware.com> | 2010-05-17 17:34:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-05-17 17:34:29 (GMT) |
| commit | 3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3 (patch) | |
| tree | 746999c765846c5978e8a5be682c561c0db6cda6 /Source/cmMakefile.cxx | |
| parent | 0559c4e04e002555dd09a57b41e4d83645a82f37 (diff) | |
| parent | c70fcf64aba77443bdb8bef3a62886c29a112df2 (diff) | |
| download | CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.zip CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.tar.gz CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.tar.bz2 | |
Merge branch 'version'
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index e3d230e..8eece6b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2359,11 +2359,9 @@ void cmMakefile::AddDefaultDefinitions() this->AddDefinition("CMAKE_MAJOR_VERSION", temp); sprintf(temp, "%d", cmVersion::GetPatchVersion()); this->AddDefinition("CMAKE_PATCH_VERSION", temp); - sprintf(temp, "%u.%u.%u", - cmVersion::GetMajorVersion(), - cmVersion::GetMinorVersion(), - cmVersion::GetPatchVersion()); - this->AddDefinition("CMAKE_VERSION", temp); + sprintf(temp, "%d", cmVersion::GetTweakVersion()); + this->AddDefinition("CMAKE_TWEAK_VERSION", temp); + this->AddDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion()); this->AddDefinition("CMAKE_FILES_DIRECTORY", cmake::GetCMakeFilesDirectory()); |