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)