From e1c329059d7dc6a1521a33bde8aab62606df1b17 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Fri, 21 Mar 2014 09:56:27 -0700 Subject: cmake: don't set CPACK_SET_DESTDIR with NSIS --- host/cmake/Modules/UHDPackage.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'host') 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 -- cgit v1.2.3 From c1222d751a68a54783145a35c3cb43f750f1a5f8 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Sun, 23 Mar 2014 20:27:19 +0100 Subject: gps: Removed superfluous include. * This file doesn't need boost::container::vector. Tested-by: Marcus D. Leech Signed-off-by: Moritz Fischer --- host/lib/usrp/gps_ctrl.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'host') 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 using namespace uhd; using namespace boost::gregorian; -- cgit v1.2.3 From a92d2f82104a0ac841e7f91001826e718f2b1656 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Sun, 23 Mar 2014 20:30:36 +0100 Subject: b200: Added missing include to b200_impl * In order to use std::ceil and std::floor, on older compilers we need to still add an include for cmath. Tested-by: Marcus D. Leech Signed-off-by: Moritz Fischer --- host/lib/usrp/b200/b200_impl.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'host') 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 #include #include +#include using namespace uhd; using namespace uhd::usrp; -- cgit v1.2.3 From d49775cf10699a902b283b7721e0100ec7d7c69a Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Mon, 24 Mar 2014 14:49:59 -0700 Subject: cmake: updated images downloader URL and MD5sum --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host') 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 -- cgit v1.2.3