diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-12 14:19:54 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-12 14:19:54 -0700 |
| commit | 5a03220fb4bdd38db8558577dc116d1ca6f2f197 (patch) | |
| tree | 39c0df3e71b52abe6f0eac5486e1ff501edca6be /host/CMakeLists.txt | |
| parent | fdb6a41aeadaac4196dd3a0158aed797f3f22333 (diff) | |
| parent | 4f18efa3d1925e8c37890d23ec627aee684ecc96 (diff) | |
| download | uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.tar.gz uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.tar.bz2 uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 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}") |