From b488026ea1996a15946ed492bf3511a401d0f727 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 23 Oct 2013 10:09:04 -0700 Subject: cmake: fixed UHD_IMAGES_DIR behavior to include directories inside specified images directory --- host/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index ebd6c1e00..602e9aa67 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -284,7 +284,7 @@ ENDIF(NOT LIBUHD_PKG AND NOT UHDHOST_PKG) # Handle pre-built images ######################################################################## IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") - FILE(GLOB _image_files "${UHD_IMAGES_DIR}/*.*") + FILE(GLOB_RECURSE _image_files "${UHD_IMAGES_DIR}/*") MESSAGE(STATUS "Using images:") FOREACH(_img ${_image_files}) MESSAGE(STATUS " ${_img}") -- cgit v1.2.3 From f3b27b87ad49baf4696f3a62fb25dbdea9630f37 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 23 Oct 2013 14:11:58 -0700 Subject: Updated images downloader URL --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 602e9aa67..ff13c1568 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -211,8 +211,8 @@ UHD_INSTALL(FILES # Images download directory for utils/uhd_images_downloader.py ######################################################################## -SET(UHD_IMAGES_MD5SUM "7eb8b0bba43cc58941115a5d3ff5c2bb") -SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.005.004-release.zip") +SET(UHD_IMAGES_MD5SUM "a7d0ef850779b32d3bc121dcc5a11f62") +SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.005.004-1-gb488026e.zip") ######################################################################## # Register top level components -- cgit v1.2.3 From 7b352da2bf52d6c3e76bed8bab8c791abf61ac1b Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 23 Oct 2013 14:21:52 -0700 Subject: Updated master images downloader URL Conflicts: host/CMakeLists.txt --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index c07520e8b..cff9206ed 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -212,8 +212,8 @@ UHD_INSTALL(FILES # Images download directory for utils/uhd_images_downloader.py ######################################################################## -SET(UHD_IMAGES_MD5SUM "1825066668276cb502ee3db62726bc0e") -SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/master_images/archive/uhd-images_003.005.004-139-g56f391ad.zip") +SET(UHD_IMAGES_MD5SUM "a58f871ebd9391b8625ecb640dd71167") +SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/master_images/archive/uhd-images_003.005.004-145-ge6f21482.zip") ######################################################################## # Register top level components -- cgit v1.2.3 From f759a6eb69c47be7b089212f635cc173617cf232 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 23 Oct 2013 14:56:45 -0700 Subject: docs: added info on libusbx for Windows --- host/docs/build.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/host/docs/build.rst b/host/docs/build.rst index 0a18e9e9a..ed71142bb 100644 --- a/host/docs/build.rst +++ b/host/docs/build.rst @@ -64,7 +64,7 @@ LibUSB * **Minimum Version:** 1.0 * **Usage:** build time + runtime (optional) * **Download URL:** http://sourceforge.net/projects/libusb/files/libusb-1.0/ -* **Download URL (Windows binaries):** http://www.libusb.org/wiki/windows_backend#LatestBinarySnapshots +* **Download URL (Windows):** https://github.com/libusbx/libusbx ^^^^^^^^^^^^^^^^ Python @@ -169,7 +169,7 @@ Generate the project with CMake * Click "Generate", and a project file will be created in the build directory. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -LibUSB CMake notes +LibUSB notes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ On Windows, CMake does not have the advantage of **pkg-config**, so we must manually tell CMake how to locate the LibUSB header and lib. @@ -182,6 +182,8 @@ so we must manually tell CMake how to locate the LibUSB header and lib. * Check the box to enable USB support, click "Configure" and "Generate". +**Note:** On Windows, LibUSBx is required to use most USB3 controllers. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Build the project in MSVC ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- cgit v1.2.3