diff options
| author | Josh Blum <josh@joshknows.com> | 2012-11-13 15:00:34 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-11-13 15:00:34 -0800 |
| commit | f5a0656bf290c9caa49c341acf20034990919b12 (patch) | |
| tree | 2797b2e77af369a1d8b5e95af71e7775a973b949 | |
| parent | 104867d4a0557c97495613aa9e44c970c677c16f (diff) | |
| parent | 5d3d9a741c8780ce97d104366ca310be7a6e7d5d (diff) | |
| download | uhd-f5a0656bf290c9caa49c341acf20034990919b12.tar.gz uhd-f5a0656bf290c9caa49c341acf20034990919b12.tar.bz2 uhd-f5a0656bf290c9caa49c341acf20034990919b12.zip | |
Merge branch 'maint34' into maint
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 6b1d84941..faa686710 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -65,10 +65,18 @@ ENDIF() IF(UHD_RELEASE_MODE) SET(UHD_GIT_HASH ${UHD_RELEASE_MODE}) + + #Ignore UHD_GIT_COUNT in UHD_VERSION if the string 'release' is in UHD_RELEASE_MODE + EXECUTE_PROCESS( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${PYTHON_EXECUTABLE} -c "print 'release' in '${UHD_RELEASE_MODE}'" + OUTPUT_VARIABLE TRIM_UHD_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE + ) ENDIF() + ######################################################################## -IF(UHD_RELEASE_MODE STREQUAL "release") +IF(TRIM_UHD_VERSION STREQUAL "True") 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}") |