diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-08 11:56:02 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-08 11:56:02 -0700 |
| commit | 7a2d39f425f6bc5df6a4f7206d3fa10f8e1e67c3 (patch) | |
| tree | c0f3b142d6c288a7d214d82bb885c8797d3d2587 /gr-trellis/src/lib | |
| parent | b06328b4adee941fe62f12a848cc903097711bdd (diff) | |
| parent | f29a49a40a3f706ae14d7d69c536d87eff3b53db (diff) | |
Merge branch 'next' into digital
Diffstat (limited to 'gr-trellis/src/lib')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index e9222b5fdb..3e449bcf8f 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -100,6 +100,11 @@ expand_h_cc_i(trellis_sccc_decoder_combined_XX fb fs fi cb cs ci) expand_h_cc_i(trellis_pccc_decoder_X b s i) expand_h_cc_i(trellis_pccc_decoder_combined_XX fb fs fi cb cs ci) +ADD_CUSTOM_TARGET(trellis_generated DEPENDS + ${generated_trellis_includes} + ${generated_trellis_swigs} +) + ######################################################################## # Create the master trellis swig include files ######################################################################## @@ -195,21 +200,13 @@ IF(ENABLE_PYTHON) INCLUDE(GrPython) INCLUDE(GrSwig) +SET(GR_SWIG_TARGET_DEPS gengen_generated trellis_generated) SET(GR_SWIG_INCLUDE_DIRS ${GR_TRELLIS_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_DIGITAL_SWIG_INCLUDE_DIRS} ) - SET(GR_SWIG_LIBRARIES gnuradio-trellis) -FILE(GLOB GR_SWIG_SOURCE_DEPS - "${CMAKE_CURRENT_SOURCE_DIR}/*.i" - "${CMAKE_CURRENT_SOURCE_DIR}/*.h" -) -LIST(APPEND GR_SWIG_SOURCE_DEPS - ${generated_trellis_swigs} - ${generated_trellis_includes} -) GR_SWIG_MAKE(trellis trellis.i) GR_SWIG_INSTALL( |