diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 21:21:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 21:21:39 -0500 |
| commit | 60dfd1fda2a48dcd111fac115d0d5c70afb210d2 (patch) | |
| tree | ad78b3a090373ce90ebe361479ba7e0f20589f27 /cmake | |
| parent | 83c74035b506c1bbc447ab1abd754915b1f44cb8 (diff) | |
| parent | 498604cc5b335f8ad9eac798e45b4b8d5d847506 (diff) | |
Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 9199a702bb..bafd0a7326 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -54,6 +54,8 @@ if("${MINOR_VERSION}" STREQUAL "git") set(VERSION "${GIT_DESCRIBE}") set(DOCVER "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}") set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}") + set(RC_MINOR_VERSION "0") + set(RC_MAINT_VERSION "0") elseif("${MAINT_VERSION}" STREQUAL "git") # VERSION: 3.3.1git-xxx-gxxxxxxxx # DOCVER: 3.3.1git @@ -61,6 +63,8 @@ elseif("${MAINT_VERSION}" STREQUAL "git") set(VERSION "${GIT_DESCRIBE}") set(DOCVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}") set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}") + math(EXPR RC_MINOR_VERSION "${MINOR_VERSION} - 1") + set(RC_MAINT_VERSION "0") else() # This is a numbered release. # VERSION: 3.3.1{.x} @@ -73,4 +77,6 @@ else() endif() set(DOCVER "${VERSION}") set(LIBVER "${VERSION}") + set(RC_MINOR_VERSION ${MINOR_VERSION}) + set(RC_MAINT_VERSION ${MAINT_VERSION}) endif() |