diff options
| author | michael-west <michael.west@ettus.com> | 2014-03-25 15:55:50 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2014-03-25 15:55:50 -0700 |
| commit | ff8a1252f3a51369abe0a165d963b781089ec66c (patch) | |
| tree | fb1491c381beec89a7f706378dc3876b5d8e73b9 /host | |
| parent | 13b20fbef4fd7be8926c05207aafcdad620da536 (diff) | |
| parent | 36583c5b6a6a50f9bc801efb57edcc86a1f49974 (diff) | |
| download | uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.tar.gz uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.tar.bz2 uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.zip | |
Merge branch 'master' of github.com:EttusResearch/uhddev
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/gps_ctrl.cpp | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 28ad6b968..45d0cd940 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -210,8 +210,8 @@ UHD_INSTALL(FILES # Images download directory for utils/uhd_images_downloader.py ######################################################################## -SET(UHD_IMAGES_MD5SUM "596a2476126bb5fd792ec685d88f8365") -SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.000-release.zip") +SET(UHD_IMAGES_MD5SUM "00784ebb5243b0abb15db305f557e230") +SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.007.000-48-ge1c32905.zip") ######################################################################## # Register top level components diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 4aea557c8..a98a52fc7 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -200,5 +200,7 @@ IF(MSVC) ENDIF(MSVC) ######################################################################## -SET(CPACK_SET_DESTDIR "ON") +IF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) + SET(CPACK_SET_DESTDIR "ON") +ENDIF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) INCLUDE(CPack) #include after setting vars diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 66df1f3bc..a7f9b11bd 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -32,6 +32,7 @@ #include <boost/functional/hash.hpp> #include <cstdio> #include <ctime> +#include <cmath> using namespace uhd; using namespace uhd::usrp; diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp index c0d44abd5..6f5c75dec 100644 --- a/host/lib/usrp/gps_ctrl.cpp +++ b/host/lib/usrp/gps_ctrl.cpp @@ -30,7 +30,6 @@ #include "boost/tuple/tuple.hpp" #include "boost/foreach.hpp" -#include <boost/container/vector.hpp> using namespace uhd; using namespace boost::gregorian; |