diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-03 17:43:22 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-07-03 17:43:22 -0700 |
| commit | 107b131a1497451efa02b9274c22f3369ff10be0 (patch) | |
| tree | 398d3ff82e971835968762bb82d896557c0a8796 /gr-trellis/src | |
| parent | 342a400b754f3ccd306938f83ccfcb285411ba18 (diff) | |
| parent | dbc7a4c08ac27844e413a39a326bf1b50b09dd00 (diff) | |
Merge branch 'master' into next
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 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} |