diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-14 23:37:35 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-15 14:17:28 -0700 |
| commit | 24ce62d705fc8eba4b7909f08a33ec2da306d284 (patch) | |
| tree | d324d2f53dfdeca5f61d792c3b4ea9c6d5110f06 | |
| parent | 5f8d146777b7d58310f524dec887699eeb0c4b56 (diff) | |
| download | uhd-24ce62d705fc8eba4b7909f08a33ec2da306d284.tar.gz uhd-24ce62d705fc8eba4b7909f08a33ec2da306d284.tar.bz2 uhd-24ce62d705fc8eba4b7909f08a33ec2da306d284.zip | |
usb: fix for fx2_ctrl include issue
| -rw-r--r-- | host/lib/usrp/fx2/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.hpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/host/lib/usrp/fx2/CMakeLists.txt b/host/lib/usrp/fx2/CMakeLists.txt index 109eea6b7..9d1e15e16 100644 --- a/host/lib/usrp/fx2/CMakeLists.txt +++ b/host/lib/usrp/fx2/CMakeLists.txt @@ -16,12 +16,11 @@ # ######################################################################## -IF(ENABLE_USRP1) +IF(ENABLE_USB) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/fx2_ctrl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/fx2_ctrl.hpp ) -ENDIF(ENABLE_USRP1) +ENDIF(ENABLE_USB) diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp index c374149fa..e480c22ea 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.hpp +++ b/host/lib/usrp/usrp1/usrp1_iface.hpp @@ -21,7 +21,7 @@ #include <uhd/usrp/mboard_iface.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> -#include "fx2_ctrl.hpp" +#include "../fx2/fx2_ctrl.hpp" /*! * The usrp1 interface class: |