diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-28 21:09:21 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-28 21:09:21 (GMT) |
| commit | e9a80cd8a90c3309d32df58b27dcc6e061f5928f (patch) | |
| tree | ca78db84211047437136013246df896e91ae13fb | |
| parent | 07fe0176d20144e3a6331a1d41d2798732b1a647 (diff) | |
| download | CMake-e9a80cd8a90c3309d32df58b27dcc6e061f5928f.zip CMake-e9a80cd8a90c3309d32df58b27dcc6e061f5928f.tar.gz CMake-e9a80cd8a90c3309d32df58b27dcc6e061f5928f.tar.bz2 | |
ENH: add rc to version stuff
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 9 | ||||
| -rw-r--r-- | Source/cmVersion.cxx | 9 |
3 files changed, 15 insertions, 5 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 620ee85..e2d692b 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 54a778f..488c41c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -138,11 +138,16 @@ const char* cmMakefile::GetReleaseVersion() #if CMake_VERSION_MINOR & 1 return "development"; #else -# if CMake_VERSION_PATCH == 0 - return "beta"; +# 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 99ca998..6b2a6b5 100644 --- a/Source/cmVersion.cxx +++ b/Source/cmVersion.cxx @@ -56,10 +56,15 @@ std::string cmVersion::GetReleaseVersion() } return res; #else -# if CMake_VERSION_PATCH == 0 - return "beta"; +# 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 } |