summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2012-08-10 11:11:45 -0700
committerBen Reynwar <ben@reynwar.net>2012-08-10 11:11:45 -0700
commitfbb1abb0e7606fb81783e3c5bd511856355f6b27 (patch)
tree54b6161dbb7ec81b3880e55ddf964042b179f722 /gr-trellis
parent1f57cf3fee8ded4d58e77bef8ffd8d8ce4aca53c (diff)
parent9d8c03e8d6bd322661765e7ebc740dbdd743b798 (diff)
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/src/lib/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index 9080afa56e..8f29f9605b 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -187,7 +187,7 @@ if(ENABLE_PYTHON)
trellis_siso_combined_f.i
trellis_constellation_metrics_cf.i
${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
- ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
+ ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
COMPONENT "trellis_swig"
)
@@ -198,6 +198,8 @@ if(ENABLE_PYTHON)
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_SOURCE_DEPS
${generated_trellis_includes}
${generated_trellis_swigs}