diff options
| author | Michael West <michael.west@ettus.com> | 2013-10-28 14:41:39 -0700 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-10-28 14:41:39 -0700 |
| commit | 9d4c14751c7a11d1647db94259fd223685ea507c (patch) | |
| tree | 2506c4e486f1e63567bf2cb8dd9be6e5dcc0eb20 | |
| parent | 5ba9932c699fd54bc5955afebbef75dd918f340a (diff) | |
| parent | c357a16e21bffe61a066f62b44096eced8f7962a (diff) | |
| download | uhd-9d4c14751c7a11d1647db94259fd223685ea507c.tar.gz uhd-9d4c14751c7a11d1647db94259fd223685ea507c.tar.bz2 uhd-9d4c14751c7a11d1647db94259fd223685ea507c.zip | |
Merge branch 'master' into mwest_coverity
| -rw-r--r-- | host/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | host/docs/build.rst | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index e4d2ea043..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 @@ -285,7 +285,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}") diff --git a/host/docs/build.rst b/host/docs/build.rst index 00f79aaaa..5512e71ae 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |