diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-07-13 11:08:19 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-07-13 11:44:04 -0700 |
| commit | 1f0a8561f0ccda4dee47dd364d30bef4ac966721 (patch) | |
| tree | 6550a6117b1b63b4bdbfb1e210e4e0f667d4edc8 /host/cmake/Modules | |
| parent | 02316d42fcbf0a3282c0f5ef5d89059eb5ed6745 (diff) | |
| download | uhd-1f0a8561f0ccda4dee47dd364d30bef4ac966721.tar.gz uhd-1f0a8561f0ccda4dee47dd364d30bef4ac966721.tar.bz2 uhd-1f0a8561f0ccda4dee47dd364d30bef4ac966721.zip | |
cmake: Fix version numbering
UHD-* branches were being detected as "development", and #cmakedefine
does not like it when values are actually zero.
Diffstat (limited to 'host/cmake/Modules')
| -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 23b970084..1f64339cb 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -43,8 +43,8 @@ IF(GIT_FOUND) ) IF(_git_branch_result EQUAL 0) SET(UHD_GIT_BRANCH ${_git_branch}) - IF(UHD_GIT_BRANCH STREQUAL "maint") - MESSAGE(STATUS "Operating on maint branch (stable).") + IF(UHD_GIT_BRANCH MATCHES "^UHD-") + MESSAGE(STATUS "Operating on release branch (${UHD_GIT_BRANCH}).") SET(UHD_VERSION_DEVEL FALSE) ELSEIF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "Operating on master branch.") |