summaryrefslogtreecommitdiff
path: root/gr-uhd
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-07-03 17:14:56 -0700
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-07-03 17:14:56 -0700
commit791eb5decfd028372a7f24b4056dac95a5fba5e5 (patch)
tree29078d6ffcb6f3c92fc7ad88763d52ae601ae7fb /gr-uhd
parenteb2505b637075e75cafa700350d5b9297e1b7ef3 (diff)
parent86dd49f2b301fdd7e817632eeb2dcaf25c86af4c (diff)
Merge branch 'maint'
Conflicts: gruel/src/swig/CMakeLists.txt
Diffstat (limited to 'gr-uhd')
-rw-r--r--gr-uhd/swig/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 26470b3b96..795b46567c 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_UHD_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}