diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-28 16:03:52 -0500 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-28 16:03:52 -0500 |
| commit | 04280871698816e504320fea3e76a7add612ba31 (patch) | |
| tree | 89b58f2483acc1001d04224b79cca8fb53fdd79f | |
| parent | 9789fe0ec2989d28880b43c4cebdaefc5bced753 (diff) | |
| download | cmake-04280871698816e504320fea3e76a7add612ba31.tar.gz | |
ENH: add release candidate to versions
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 5 | ||||
| -rw-r--r-- | Source/cmVersion.cxx | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dfceb2f02e..ca4001c68e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,9 @@ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY) # The CMake version number. SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 4) -SET(CMake_VERSION_PATCH 4) +SET(CMake_VERSION_PATCH 5) +# for an actual release this should not be defined +SET(CMake_VERSION_RC 1) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") @@ -355,6 +357,10 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") + IF(CMake_VERSION_RC) + SET(CPACK_SOURCE_PACKAGE_FILE_NAME + "${CPACK_SOURCE_PACKAGE_FILE_NAME}-RC-${CMake_VERSION_RC}") + ENDIF(CMake_VERSION_RC) IF(NOT DEFINED CPACK_SYSTEM_NAME) SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) ENDIF(NOT DEFINED CPACK_SYSTEM_NAME) diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 620ee856f4..e2d692be6a 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -11,5 +11,5 @@ #define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@ #define CMake_VERSION_MINOR @CMake_VERSION_MINOR@ #define CMake_VERSION_PATCH @CMake_VERSION_PATCH@ - +#cmakedefine CMake_VERSION_RC @CMake_VERSION_RC@ #define CMAKE_DATA_DIR "@CMAKE_DATA_DIR@" diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8dccb13388..dd9a88bda3 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -141,7 +141,12 @@ const char* cmMakefile::GetReleaseVersion() # 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 } diff --git a/Source/cmVersion.cxx b/Source/cmVersion.cxx index bc0421b611..6e2fa17505 100644 --- a/Source/cmVersion.cxx +++ b/Source/cmVersion.cxx @@ -59,7 +59,12 @@ std::string cmVersion::GetReleaseVersion() # 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 } |