summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2010-09-09 20:41:38 -0400
committerPhilip Balister <philip@opensdr.com>2010-09-09 20:41:38 -0400
commit5fe26aa11d3fbd32aa60d44aef2a50381b497eeb (patch)
treee227349732a7aa1508fcb5a727b851500a45c97f /host/lib/usrp/usrp1
parent09a1b77a65202e6c569be7e1b31d9d453ef388a2 (diff)
parentbc824badaa981c1785d8c76d7cf56274d7c582b8 (diff)
downloaduhd-5fe26aa11d3fbd32aa60d44aef2a50381b497eeb.tar.gz
uhd-5fe26aa11d3fbd32aa60d44aef2a50381b497eeb.tar.bz2
uhd-5fe26aa11d3fbd32aa60d44aef2a50381b497eeb.zip
Merge branch 'usrp_e' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp1')
-rw-r--r--host/lib/usrp/usrp1/CMakeLists.txt32
1 files changed, 20 insertions, 12 deletions
diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt
index 229a4ce63..67487f99e 100644
--- a/host/lib/usrp/usrp1/CMakeLists.txt
+++ b/host/lib/usrp/usrp1/CMakeLists.txt
@@ -20,18 +20,26 @@
########################################################################
# Conditionally configure the USRP1 support
########################################################################
-MESSAGE(STATUS "Configuring usrp1 support...")
+MESSAGE(STATUS "Configuring USRP1 support...")
-IF(HAVE_USB_SUPPORT)
- MESSAGE(STATUS "Has USB support - found")
-ELSE(HAVE_USB_SUPPORT)
- MESSAGE(STATUS "Has USB support - not found")
-ENDIF(HAVE_USB_SUPPORT)
+IF(DEFINED ENABLE_USRP1)
+ IF(ENABLE_USRP1)
+ MESSAGE(STATUS "USRP1 support enabled by configure flag")
+ ELSE(ENABLE_USRP1)
+ MESSAGE(STATUS "USRP1 support disabled by configure flag")
+ ENDIF(ENABLE_USRP1)
+ELSE(DEFINED ENABLE_USRP1) #not defined: automatic enabling of component
+ SET(ENABLE_USRP1 ${HAVE_USB_SUPPORT})
+ENDIF(DEFINED ENABLE_USRP1)
+SET(ENABLE_USRP1 ${ENABLE_USRP1} CACHE BOOL "enable USRP1 support")
-#TODO check for usrp1 enable/disable option flag
+#sanity check when USRP1 support enabled
+IF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
+ MESSAGE(FATAL_ERROR "USRP1 support enabled without USB support")
+ENDIF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
-IF(HAVE_USB_SUPPORT)
- MESSAGE(STATUS " Building usrp1 support.")
+IF(ENABLE_USRP1)
+ MESSAGE(STATUS " Building USRP1 support.")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/include)
LIBUHD_APPEND_SOURCES(
@@ -52,6 +60,6 @@ IF(HAVE_USB_SUPPORT)
${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.cpp
${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.hpp
)
-ELSE(HAVE_USB_SUPPORT)
- MESSAGE(STATUS " Skipping usrp1 support.")
-ENDIF(HAVE_USB_SUPPORT)
+ELSE(ENABLE_USRP1)
+ MESSAGE(STATUS " Skipping USRP1 support.")
+ENDIF(ENABLE_USRP1)