uhd: added macro to enable/disable components

libuhd prints summary of components

added newline prints before config checks

6 files changed, 49 insertions, 45 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index e4de7bcc7..3a6860b93 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -61,6 +61,25 @@ MACRO(LIBUHD_PYTHON_GEN_SOURCE pyfile outfile)
     LIBUHD_APPEND_SOURCES(${outfile})
 ENDMACRO(LIBUHD_PYTHON_GEN_SOURCE)
 
+MACRO(LIBUHD_REGISTER_COMPONENT name var auto)
+    MESSAGE(STATUS "")
+    MESSAGE(STATUS "Configuring ${name} support...")
+    IF(DEFINED ${var})
+        MESSAGE(STATUS "${name} support configured ${var}=${${var}}")
+    ELSE(DEFINED ${var}) #not defined: automatic enabling of component
+        SET(${var} ${auto})
+        MESSAGE(STATUS "${name} support configured automatically")
+    ENDIF(DEFINED ${var})
+    SET(${var} ${${var}} CACHE BOOL "enable ${name} support")
+    IF(${var})
+        MESSAGE(STATUS "  Enabling ${name} support.")
+        LIST(APPEND _libuhd_enabled_components ${name})
+    ELSE(${var})
+        MESSAGE(STATUS "  Disabling ${name} support.")
+        LIST(APPEND _libuhd_disabled_components ${name})
+    ENDIF(${var})
+ENDMACRO(LIBUHD_REGISTER_COMPONENT)
+
 ########################################################################
 # Include CMakeLists.txt from subdirectories
 ########################################################################
@@ -109,3 +128,24 @@ INSTALL(TARGETS uhd
     ARCHIVE DESTINATION ${LIBRARY_DIR} # .lib file
     RUNTIME DESTINATION ${LIBRARY_DIR} # .dll file
 )
+
+########################################################################
+# Print configuration summary
+########################################################################
+MESSAGE(STATUS "")
+MESSAGE(STATUS "######################################################")
+MESSAGE(STATUS "# LibUHD enabled components                           ")
+MESSAGE(STATUS "######################################################")
+FOREACH(comp ${_libuhd_enabled_components})
+    MESSAGE(STATUS "  * ${comp}")
+ENDFOREACH(comp)
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "######################################################")
+MESSAGE(STATUS "# LibUHD disabled components                          ")
+MESSAGE(STATUS "######################################################")
+FOREACH(comp ${_libuhd_disabled_components})
+    MESSAGE(STATUS "  * ${comp}")
+ENDFOREACH(comp)
+
+MESSAGE(STATUS "")
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt
index b95d46381..1ab7c30e7 100644
--- a/host/lib/transport/CMakeLists.txt
+++ b/host/lib/transport/CMakeLists.txt
@@ -20,6 +20,8 @@
 ########################################################################
 # Setup libusb
 ########################################################################
+MESSAGE(STATUS "")
+MESSAGE(STATUS "Configuring USB support...")
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/lib/transport)
 FIND_PACKAGE(USB1 REQUIRED)
 
@@ -67,6 +69,7 @@ ENDIF(HAVE_ARM_NEON_H)
 ########################################################################
 # Setup defines for interface address discovery
 ########################################################################
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Configuring interface address discovery...")
 
 INCLUDE(CheckIncludeFileCXX)
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)
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index 32b679d49..aecd3a4b0 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -20,6 +20,7 @@
 ########################################################################
 # Setup defines for process scheduling
 ########################################################################
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Configuring priority scheduling...")
 
 INCLUDE(CheckCXXSourceCompiles)
@@ -56,6 +57,7 @@ ENDIF(HAVE_PTHREAD_SETSCHEDPARAM)
 ########################################################################
 # Setup defines for module loading
 ########################################################################
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Configuring module loading...")
 
 INCLUDE(CheckIncludeFileCXX)