diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-11-27 14:20:35 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-11-27 14:20:35 -0800 |
| commit | 8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382 (patch) | |
| tree | ea75e25bb7dde296b8c68f282e4841896ca6d122 | |
| parent | dd3fea009cb0d66b31f90bf56ca1e55e5aba2fe7 (diff) | |
| download | uhd-8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382.tar.gz uhd-8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382.tar.bz2 uhd-8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382.zip | |
cmake: remove Git hash from version string when 'rc' is present
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index c07b18f01..fd1b5e7bf 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 006) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages @@ -87,7 +87,7 @@ IF(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}'" + COMMAND ${PYTHON_EXECUTABLE} -c "print ('release' in '${UHD_RELEASE_MODE}') or ('rc' in '${UHD_RELEASE_MODE}')" OUTPUT_VARIABLE TRIM_UHD_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) ENDIF() |