summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-12-22 16:39:13 -0800
committerJosh Blum <josh@joshknows.com>2010-12-22 16:39:13 -0800
commit8f93121987af42d8b049d29cd8ea101a6306fa87 (patch)
tree4544ed0300d69fb3b3b65a9dfdffa90532ec038a
parent42ed1d34245bf14f71e4777bc8efc1d4ff4db26f (diff)
downloaduhd-8f93121987af42d8b049d29cd8ea101a6306fa87.tar.gz
uhd-8f93121987af42d8b049d29cd8ea101a6306fa87.tar.bz2
uhd-8f93121987af42d8b049d29cd8ea101a6306fa87.zip
uhd: fixed component registry function
-rw-r--r--host/config/Component.cmake10
1 files changed, 7 insertions, 3 deletions
diff --git a/host/config/Component.cmake b/host/config/Component.cmake
index 5384cc53f..0263b071f 100644
--- a/host/config/Component.cmake
+++ b/host/config/Component.cmake
@@ -21,9 +21,13 @@ SET(_uhd_disabled_components "" CACHE INTERNAL "" FORCE)
########################################################################
# Register a component into the system
-# Usage: LIBUHD_REGISTER_COMPONENT(<name> <var> <enb> <deps> <dis>)
+# - name the component string name
+# - var the global enable variable
+# - enb the default enable setting
+# - deps a list of dependencies
+# - dis the default disable setting
########################################################################
-FUNCTION(LIBUHD_REGISTER_COMPONENT name var)
+FUNCTION(LIBUHD_REGISTER_COMPONENT name var enb deps dis)
INCLUDE(CMakeDependentOption)
MESSAGE(STATUS "")
MESSAGE(STATUS "Configuring ${name} support...")
@@ -34,7 +38,7 @@ FUNCTION(LIBUHD_REGISTER_COMPONENT name var)
ENDIF(DEFINED ${var})
#setup the dependent option for this component
- CMAKE_DEPENDENT_OPTION(${var} "enable ${name} support" ${ARGN})
+ CMAKE_DEPENDENT_OPTION(${var} "enable ${name} support" ${enb} "${deps}" ${dis})
#remove previous occurrence of component in either list
IF(DEFINED _uhd_enabled_components)