aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/CMakeLists.txt
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-01-04 19:29:36 -0800
committerJosh Blum <josh@joshknows.com>2011-01-04 19:29:36 -0800
commitb5860c0fbd6f18b43b1e0578adfaca1b2ef3239c (patch)
tree255b42702a6c11bb91af3180223036667ed461b7 /host/lib/CMakeLists.txt
parente46edab958579064357d3dc095c0c63e2c5a1273 (diff)
parent466bb0a7c25a2a4d252582f812edc83ba6facbfe (diff)
downloaduhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.tar.gz
uhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.tar.bz2
uhd-b5860c0fbd6f18b43b1e0578adfaca1b2ef3239c.zip
Merge branch 'convert' into next
Diffstat (limited to 'host/lib/CMakeLists.txt')
-rw-r--r--host/lib/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 498841561..9ab121df5 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2010 Ettus Research LLC
+# Copyright 2010-2011 Ettus Research LLC
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -89,6 +89,7 @@ ENDMACRO(INCLUDE_SUBDIRECTORY)
# Include subdirectories (different than add)
########################################################################
INCLUDE_SUBDIRECTORY(ic_reg_maps)
+INCLUDE_SUBDIRECTORY(convert)
INCLUDE_SUBDIRECTORY(transport)
INCLUDE_SUBDIRECTORY(usrp)
INCLUDE_SUBDIRECTORY(utils)