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/cmake/Modules/UHDVersion.cmake | |
| 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/cmake/Modules/UHDVersion.cmake')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index d74704471..e81c891f4 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.") |