code changes

lib/CMakeLists.txt

@@ -20,15 +20,102 @@
 ########################################################################
 include(GrPlatform) #define LIB_SUFFIX
 
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}/../python')
+    import build_utils
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = build_utils.standard_dict(name, sig, 'ieee802_11')
+        build_utils.expand_template(d, inp, '_impl')
+")
+
+
+macro(expand_cc_h_impl root)
+  #make a list of all the generated files
+  unset(expanded_files_cc_impl)
+  unset(expanded_files_h_impl)
+  foreach(sig ${ARGN})
+    string(REGEX REPLACE "X+" ${sig} name ${root})
+    list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc)
+    list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
+    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
+  endforeach(sig)
+
+  #create a command to generate the _impl.cc files
+  add_custom_command(
+    OUTPUT ${expanded_files_cc_impl}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.cc.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}_impl.cc.t ${ARGN}
+  )
+
+  #create a command to generate the _impl.h files
+  add_custom_command(
+    OUTPUT ${expanded_files_h_impl}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.h.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}_impl.h.t ${ARGN}
+  )
+
+  #make _impl.cc source files depend on headers to force generation
+  set_source_files_properties(${expanded_files_cc_impl}
+    PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
+  )
+
+  #make _impl.h source files depend on headers to force generation
+  set_source_files_properties(${expanded_files_h_impl}
+    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
+  )
+
+  #install rules for the generated cc files
+  list(APPEND generated_sources ${expanded_files_cc_impl})
+endmacro(expand_cc_h_impl)
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+expand_cc_h_impl(moving_average_XX cc ff)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/../include
+    ${GR_BLOCKS_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${VOLK_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+)
+
+########################################################################
+# Setup library
+########################################################################
 list(APPEND gr_ieee802_11_sources
+    ${generated_sources}
     ether_encap_impl.cc
     ofdm_decode_mac.cc
     ofdm_decode_signal.cc
     ofdm_equalize_symbols.cc
+    ofdm_freq_est.cc
+    ofdm_mac.cc
+    ofdm_mapper.cc
     ofdm_parse_mac.cc
+    ofdm_pilot.cc
+    ofdm_preamble.cc
     ofdm_sync_long.cc
     ofdm_sync_short.cc
-    ofdm_utils.cc
+    utils.cc
+    wave_llc_impl.cc
+    wave_short_message_impl.cc
 )
 
 list(APPEND gr_ieee802_11_libs
@@ -39,6 +126,7 @@ list(APPEND gr_ieee802_11_libs
 )
 
 add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})
+add_dependencies(gnuradio-ieee802_11 ieee802_11_generated_includes)
 target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs} itpp)
 set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS")