diff options
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index ccea35006..c388a2ada 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -489,7 +489,7 @@ ELSEIF(UHDHOST_PKG) SET(PRINT_APPEND " (Debian uhd-host package configuration)") ENDIF(LIBUHD_PKG) UHD_PRINT_COMPONENT_SUMMARY() -IF(UHD_VERSION_DEVEL) +IF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH STREQUAL "maint") MESSAGE(STATUS "******************************************************") IF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "* You are building the UHD development master branch.") @@ -502,6 +502,6 @@ IF(UHD_VERSION_DEVEL) MESSAGE(STATUS "* unstable and/or experimental!") ENDIF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "******************************************************") -ENDIF(UHD_VERSION_DEVEL) +ENDIF(UHD_VERSION_DEVEL AND NOT UHD_GIT_BRANCH STREQUAL "maint") 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 abf75b1b2..26003bcbf 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -52,9 +52,11 @@ IF(GIT_FOUND) RESULT_VARIABLE _git_branch_result ) IF(_git_branch_result EQUAL 0) - IF(_git_branch STREQUAL "maint") + SET(UHD_GIT_BRANCH ${_git_branch}) + IF(UHD_GIT_BRANCH STREQUAL "maint") MESSAGE(STATUS "Operating on maint branch (stable).") - ELSEIF(_git_branch STREQUAL "master") + SET(UHD_VERSION_DEVEL FALSE) + ELSEIF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "Operating on master branch.") SET(UHD_VERSION_DEVEL TRUE) ELSE() @@ -65,7 +67,6 @@ IF(GIT_FOUND) ) SET(UHD_VERSION_PATCH ${_git_safe_branch}) SET(UHD_VERSION_DEVEL TRUE) - SET(UHD_GIT_BRANCH ${_git_branch}) ENDIF() ELSE() MESSAGE(STATUS "Could not determine git branch. Probably building from tarball.") |