Merge branch 'master' into usrp_e

Conflicts:
	host/examples/CMakeLists.txt

2 files changed, 60 insertions, 31 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)
diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt
index 796126d07..078485d6a 100644
--- a/host/lib/usrp/usrp2/CMakeLists.txt
+++ b/host/lib/usrp/usrp2/CMakeLists.txt
@@ -17,22 +17,43 @@
 
 #This file will be included by cmake, use absolute paths!
 
-LIBUHD_APPEND_SOURCES(
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.hpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.hpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_iface.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dsp_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/io_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/mboard_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.hpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.hpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.hpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.hpp
-)
+########################################################################
+# Conditionally configure the USRP2 support
+########################################################################
+MESSAGE(STATUS "Configuring USRP2 support...")
+
+IF(DEFINED ENABLE_USRP2)
+    IF(ENABLE_USRP2)
+        MESSAGE(STATUS "USRP2 support enabled by configure flag")
+    ELSE(ENABLE_USRP2)
+        MESSAGE(STATUS "USRP2 support disabled by configure flag")
+    ENDIF(ENABLE_USRP2)
+ELSE(DEFINED ENABLE_USRP2) #not defined: automatic enabling of component
+    SET(ENABLE_USRP2 TRUE)
+ENDIF(DEFINED ENABLE_USRP2)
+SET(ENABLE_USRP2 ${ENABLE_USRP2} CACHE BOOL "enable USRP2 support")
+
+IF(ENABLE_USRP2)
+    MESSAGE(STATUS "  Building USRP2 support.")
+    LIBUHD_APPEND_SOURCES(
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_iface.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dsp_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/io_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/mboard_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.hpp
+    )
+ELSE(ENABLE_USRP2)
+    MESSAGE(STATUS "  Skipping USRP2 support.")
+ENDIF(ENABLE_USRP2)