aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/ic_reg_maps
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-03 11:18:50 -0800
committerJosh Blum <josh@joshknows.com>2011-03-03 11:18:50 -0800
commitf938ed7938021c10bb0a0ce47e6d40d10f89abc2 (patch)
tree0c6793bd4bd8ba0a03ee8d83a0b67e3fe231356c /host/lib/ic_reg_maps
parentb99c655d2ae52ee14e6430b175fe4849ccc0f0e7 (diff)
parent7aed95a658deb52404ba49774cfcecf96df654a8 (diff)
downloaduhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.tar.gz
uhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.tar.bz2
uhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.zip
Merge branch 'master' into next
Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_impl.cpp
Diffstat (limited to 'host/lib/ic_reg_maps')
-rw-r--r--host/lib/ic_reg_maps/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/ic_reg_maps/CMakeLists.txt b/host/lib/ic_reg_maps/CMakeLists.txt
index 67a63c32b..9e1f4705e 100644
--- a/host/lib/ic_reg_maps/CMakeLists.txt
+++ b/host/lib/ic_reg_maps/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
@@ -20,6 +20,7 @@
########################################################################
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+SET(LIBUHD_PYTHON_GEN_SOURCE_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/common.py)
LIBUHD_PYTHON_GEN_SOURCE(
${CMAKE_CURRENT_SOURCE_DIR}/gen_adf4350_regs.py
@@ -90,3 +91,5 @@ LIBUHD_PYTHON_GEN_SOURCE(
${CMAKE_CURRENT_SOURCE_DIR}/gen_tuner_4937di5_regs.py
${CMAKE_CURRENT_BINARY_DIR}/tuner_4937di5_regs.hpp
)
+
+UNSET(LIBUHD_PYTHON_GEN_SOURCE_DEPS)