summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--host/Modules/UHDVersion.cmake2
-rw-r--r--host/lib/usrp/fx2/CMakeLists.txt5
-rw-r--r--host/lib/usrp/usrp1/usrp1_iface.hpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake
index 1a6a3f775..f5364941c 100644
--- a/host/Modules/UHDVersion.cmake
+++ b/host/Modules/UHDVersion.cmake
@@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET)
########################################################################
SET(UHD_VERSION_MAJOR 003)
SET(UHD_VERSION_MINOR 001)
-SET(UHD_VERSION_PATCH 001)
+SET(UHD_VERSION_PATCH 002)
########################################################################
# Version information discovery through git log
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: