From 7951170c6161d9266726ec19e8c009500cf11f75 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 14 Jun 2011 23:37:35 -0700 Subject: usb: fix for fx2_ctrl include issue --- host/lib/usrp/fx2/CMakeLists.txt | 5 ++--- host/lib/usrp/usrp1/usrp1_iface.hpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'host') 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 #include #include -#include "fx2_ctrl.hpp" +#include "../fx2/fx2_ctrl.hpp" /*! * The usrp1 interface class: -- cgit v1.2.3