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 | |
| 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')
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 4 | ||||
| -rw-r--r-- | host/include/config.h.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 5b19be476..281c55c5d 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -585,7 +585,7 @@ ELSEIF(UHDHOST_PKG) SET(PRINT_APPEND " (Debian uhd-host package configuration)") ENDIF(LIBUHD_PKG) UHD_PRINT_COMPONENT_SUMMARY() -IF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH STREQUAL "maint") +IF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH MATCHES "^UHD-") MESSAGE(STATUS "******************************************************") IF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "* You are building the UHD development master branch.") @@ -598,6 +598,6 @@ IF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH STREQUAL "maint") MESSAGE(STATUS "* unstable and/or experimental!") ENDIF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "******************************************************") -ENDIF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH STREQUAL "maint") +ENDIF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH MATCHES "^UHD-") MESSAGE(STATUS "Building version: ${UHD_VERSION}${PRINT_APPEND}") MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") 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.") diff --git a/host/include/config.h.in b/host/include/config.h.in index c69673908..6557254b6 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -8,10 +8,10 @@ #cmakedefine HAVE_LOG2 /* Version macros */ -#cmakedefine UHD_VERSION_MAJOR ${UHD_VERSION_MAJOR} -#cmakedefine UHD_VERSION_API ${UHD_VERSION_API} -#cmakedefine UHD_VERSION_ABI ${UHD_VERSION_ABI} -#cmakedefine UHD_VERSION_PATCH ${UHD_VERSION_PATCH} +#define UHD_VERSION_MAJOR ${UHD_VERSION_MAJOR} +#define UHD_VERSION_API ${UHD_VERSION_API} +#define UHD_VERSION_ABI ${UHD_VERSION_ABI} +#define UHD_VERSION_PATCH ${UHD_VERSION_PATCH} #cmakedefine ENABLE_USB #cmakedefine ENABLE_LIBERIO #ifndef UHD_VERSION |