diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-01 10:27:54 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-01 10:27:54 -0700 |
| commit | 1721352e905e10dbff48d44b66b1684020a103d7 (patch) | |
| tree | 9a66dc2ad56cc4c6d483843dbda90905380bda28 | |
| parent | 48f6e1f8aae24ee4ff3b15232cfc335b0210ed11 (diff) | |
| download | uhd-1721352e905e10dbff48d44b66b1684020a103d7.tar.gz uhd-1721352e905e10dbff48d44b66b1684020a103d7.tar.bz2 uhd-1721352e905e10dbff48d44b66b1684020a103d7.zip | |
uhd: install dlls into runtime path, updated docs
| -rw-r--r-- | host/docs/build.rst | 4 | ||||
| -rw-r--r-- | host/docs/index.rst | 4 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/host/docs/build.rst b/host/docs/build.rst index b81e25de1..c645817ab 100644 --- a/host/docs/build.rst +++ b/host/docs/build.rst @@ -197,9 +197,7 @@ Open the Visual Studio Command Prompt Shorcut: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Setup the PATH environment variable ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -* Add the boost library path to %PATH% (usually c:\\program files\\boost\\<version>\\lib) -* Add the uhd library path to %PATH% (usually c:\\program files\\uhd\\lib) -* Add the libusb library to %PATH% (if using usb support) +* Add the uhd bin path to %PATH% (usually c:\\program files\\uhd\\bin) **Note:** The interface for editing environment variable paths in Windows is very poor. diff --git a/host/docs/index.rst b/host/docs/index.rst index 734300164..467d5f385 100644 --- a/host/docs/index.rst +++ b/host/docs/index.rst @@ -4,9 +4,7 @@ UHD - Universal Hardware Driver The UHD is the universal hardware driver for Ettus Research products. The goal of the UHD is to provide a host driver and api for current and future Ettus Research products. -Users will be able to use the UHD driver standalone/without gnuradio. -Also, a dual license option will be available for those who build against the UHD -but cannot release their software products under the GPL. +Users will be able to use the UHD driver standalone or with 3rd party applications. ------------------------------------------------------------------------ Contents diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 54f4893e3..f8886566a 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -121,5 +121,5 @@ ENDIF(DEFINED LIBUHD_OUTPUT_NAME) INSTALL(TARGETS uhd LIBRARY DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .so file ARCHIVE DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .lib file - RUNTIME DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .dll file + RUNTIME DESTINATION ${RUNTIME_DIR} COMPONENT libraries # .dll file ) |