diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-09-06 12:01:23 -0400 |
| commit | c9dc582402d2551ead29a60256fdf64a1d43534c (patch) | |
| tree | 4e9fe56c173a8e080c84c4c113a5ac5c5f1c236c /gr-trellis/src | |
| parent | 1300d48af4752037feac4fae7c3c64187cc0a5a8 (diff) | |
| parent | a4e2e8a9a2c8a6bbd6d676a17b0e2732e11af09f (diff) | |
Merge branch 'master' into gr_log
Conflicts:
CMakeLists.txt
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/build_guide.dox
gnuradio-core/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
Diffstat (limited to 'gr-trellis/src')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index c3f753f859..be7baa785d 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -191,7 +191,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" ) @@ -202,6 +202,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} |