3 files changed, 4 insertions, 45 deletions
diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt
index 022015231..8b6ba78d2 100644
--- a/host/lib/usrp/usrp1/CMakeLists.txt
+++ b/host/lib/usrp/usrp1/CMakeLists.txt
@@ -20,18 +20,7 @@
 ########################################################################
 # Conditionally configure the USRP1 support
 ########################################################################
-MESSAGE(STATUS "Configuring USRP1 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")
+LIBUHD_REGISTER_COMPONENT("USRP1" ENABLE_USRP1 ${HAVE_USB_SUPPORT})
 
 #sanity check when USRP1 support enabled
 IF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
@@ -39,7 +28,6 @@ IF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
 ENDIF(ENABLE_USRP1 AND NOT HAVE_USB_SUPPORT)
 
 IF(ENABLE_USRP1)
-    MESSAGE(STATUS "  Building USRP1 support.")
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common)
 
     LIBUHD_APPEND_SOURCES(
@@ -60,6 +48,4 @@ IF(ENABLE_USRP1)
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.cpp
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.hpp
     )
-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 f7984fce5..afd69cae9 100644
--- a/host/lib/usrp/usrp2/CMakeLists.txt
+++ b/host/lib/usrp/usrp2/CMakeLists.txt
@@ -20,21 +20,9 @@
 ########################################################################
 # 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")
+LIBUHD_REGISTER_COMPONENT("USRP2" ENABLE_USRP2 TRUE)
 
 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
@@ -57,6 +45,4 @@ IF(ENABLE_USRP2)
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.hpp
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.cpp
     )
-ELSE(ENABLE_USRP2)
-    MESSAGE(STATUS "  Skipping USRP2 support.")
 ENDIF(ENABLE_USRP2)
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt
index 66c87e0d8..3c5c58ee0 100644
--- a/host/lib/usrp/usrp_e100/CMakeLists.txt
+++ b/host/lib/usrp/usrp_e100/CMakeLists.txt
@@ -20,22 +20,11 @@
 ########################################################################
 # Conditionally configure the USRP-E100 support
 ########################################################################
-MESSAGE(STATUS "Configuring USRP-E100 support...")
-
-IF(DEFINED ENABLE_USRP_E100)
-    IF(ENABLE_USRP_E100)
-        MESSAGE(STATUS "USRP-E100 support enabled by configure flag")
-    ELSE(ENABLE_USRP_E100)
-        MESSAGE(STATUS "USRP-E100 support disabled by configure flag")
-    ENDIF(ENABLE_USRP_E100)
-ELSE(DEFINED ENABLE_USRP_E100) #not defined: automatic disabling of component
-    SET(ENABLE_USRP_E100 FALSE)
-ENDIF(DEFINED ENABLE_USRP_E100)
-SET(ENABLE_USRP_E100 ${ENABLE_USRP_E100} CACHE BOOL "enable USRP-E100 support")
+LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 FALSE)
 
 IF(ENABLE_USRP_E100)
-    MESSAGE(STATUS "  Building USRP-E100 support.")
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include)
+
     LIBUHD_APPEND_SOURCES(
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.cpp
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.hpp
@@ -55,6 +44,4 @@ IF(ENABLE_USRP_E100)
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_regs.hpp
     )
-ELSE(ENABLE_USRP_E100)
-    MESSAGE(STATUS "  Skipping USRP-E100 support.")
 ENDIF(ENABLE_USRP_E100)