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 | |
| parent | fdb6a41aeadaac4196dd3a0158aed797f3f22333 (diff) | |
| parent | 4f18efa3d1925e8c37890d23ec627aee684ecc96 (diff) | |
| download | uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.tar.gz uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.tar.bz2 uhd-5a03220fb4bdd38db8558577dc116d1ca6f2f197.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 7 | ||||
| -rw-r--r-- | host/lib/usrp/cores/time_core_3000.cpp | 4 |
3 files changed, 8 insertions, 7 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 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.") diff --git a/host/lib/usrp/cores/time_core_3000.cpp b/host/lib/usrp/cores/time_core_3000.cpp index 694edf31c..45b1750d2 100644 --- a/host/lib/usrp/cores/time_core_3000.cpp +++ b/host/lib/usrp/cores/time_core_3000.cpp @@ -73,10 +73,10 @@ struct time_core_3000_impl : time_core_3000 //useful warning for debugging actual rate const size_t ticks_elapsed = size_t(_tick_rate*approx_secs); - const size_t appox_rate = size_t(ticks_elapsed/(sleep_millis/1e3)); + const size_t approx_rate = size_t(ticks_elapsed/(sleep_millis/1e3)); if (test_fail) UHD_MSG(warning) << "Expecting clock rate: " << (_tick_rate/1e6) << " MHz\n" - << "Appoximate clock rate: " << (appox_rate/1e6) << " MHz\n" + << "Approximate clock rate: " << (approx_rate/1e6) << " MHz\n" << std::endl; } |