diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
| commit | 4378ad458441e1431ea3bdaafd8d663d3061f6f3 (patch) | |
| tree | 75dc6a1b06e80c051f39ce101b72c2c10b0e1b54 /host/cmake/Modules/UHDVersion.cmake | |
| parent | f84d7579aecaf2a90965331b200f6b298cd0c1d4 (diff) | |
| parent | 81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff) | |
| download | uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.gz uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.bz2 uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.zip | |
Merge branch 'master' into next
Diffstat (limited to 'host/cmake/Modules/UHDVersion.cmake')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index b9ddddae3..13d952353 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 004) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Version information discovery through git log @@ -68,4 +68,8 @@ IF(UHD_RELEASE_MODE) ENDIF() ######################################################################## -SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") +IF(UHD_RELEASE_MODE STREQUAL "release") + SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}") +ELSE() + SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") +ENDIF() |