diff options
| author | Josh Blum <josh@joshknows.com> | 2011-11-04 21:44:10 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-04 21:44:10 -0700 |
| commit | 0b3a4a2c43e9fd4e3cc03c694b408034954c9d74 (patch) | |
| tree | 3c49d2ec6ab91a3b43ad8015c069a55d82cffb70 /gr-trellis/src/lib | |
| parent | 56fcd5f9b22af33976f9413d3a9d0aec41a7b556 (diff) | |
cmake: fixed up swig deps properly for make -j*
Also took the time to fix up the swig index file generation.
This may have not-been auto-regenerating before as well.
Diffstat (limited to 'gr-trellis/src/lib')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index 61cc0d6505..5a1c33c444 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -108,33 +108,28 @@ add_custom_target(trellis_generated DEPENDS ######################################################################## # Create the master trellis swig include files ######################################################################## -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.py " -import os, sys -if __name__ == '__main__': - incs = sys.argv[2:] - h_incs = '\\n'.join(['#include<%s.h>'%(os.path.splitext(os.path.basename(inc))[0]) for inc in incs]) - i_incs = '\\n'.join(['%%include<%s>'%(os.path.basename(inc)) for inc in incs]) - open(sys.argv[1], 'w').write(''' +set(generated_index ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i.in) +file(WRITE ${generated_index} " // // This file is machine generated. All edits will be overwritten // - -%%{ -%s -%%} - -%s - -'''%(h_incs, i_incs)) ") -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i - DEPENDS ${generated_trellis_swigs} - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} - ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.py - ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i - ${generated_trellis_swigs} +file(APPEND ${generated_index} "%{\n") +foreach(swig_file ${generated_trellis_swigs}) + get_filename_component(name ${swig_file} NAME_WE) + file(APPEND ${generated_index} "#include<${name}.h>\n") +endforeach(swig_file) +file(APPEND ${generated_index} "%}\n") + +foreach(swig_file ${generated_trellis_swigs}) + get_filename_component(name ${swig_file} NAME) + file(APPEND ${generated_index} "%include<${name}>\n") +endforeach(swig_file) + +execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${generated_index} ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i ) ######################################################################## @@ -186,6 +181,7 @@ install(FILES if(ENABLE_PYTHON) install(FILES + trellis.i ${generated_trellis_swigs} fsm.i interleaver.i @@ -204,8 +200,7 @@ if(ENABLE_PYTHON) include(GrPython) include(GrSwig) -set(GR_SWIG_SOURCE_DEPS ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i) -set(GR_SWIG_TARGET_DEPS trellis_generated trellis_generated_index) +set(GR_SWIG_TARGET_DEPS trellis_generated) set(GR_SWIG_INCLUDE_DIRS ${GR_TRELLIS_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} @@ -220,10 +215,4 @@ GR_SWIG_INSTALL( COMPONENT "trellis_python" ) -install( - FILES trellis.i - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "trellis_swig" -) - endif(ENABLE_PYTHON) |