diff options
| author | Josh Blum | 2013-01-13 13:51:46 -0800 |
|---|---|---|
| committer | Josh Blum | 2013-01-13 15:23:48 -0800 |
| commit | e826097e09fdfb04d14bf87861646b88229db881 (patch) | |
| tree | 38d4f3e09cfbcedcbfc4ed6a18c0aafa4121dd9c /gr-fcd/examples | |
| parent | 3abf4a11534d0db96e32830f629c8e34a8098798 (diff) | |
| download | gnuradio-e826097e09fdfb04d14bf87861646b88229db881.tar.gz gnuradio-e826097e09fdfb04d14bf87861646b88229db881.tar.bz2 gnuradio-e826097e09fdfb04d14bf87861646b88229db881.zip | |
gras: support changeset for 3.6.4
used volk from next branch cf5c930d89ac89ba5a0da4a616c88d3c37e018ae for grextras support (it uses the dispatcher)
empty stubs for the gr_basic_block msg passing. This is going to be difficult to figure out. The alias stuff may or may not be related
most qa pass, there seems to be some additional issues, will be working through them on futher commits
Conflicts:
gnuradio-core/CMakeLists.txt
gnuradio-core/src/lib/runtime/CMakeLists.txt
gnuradio-core/src/lib/runtime/gr_block.cc
gnuradio-core/src/lib/runtime/gr_block.h
gnuradio-core/src/lib/runtime/gr_hier_block2.h
gnuradio-core/src/lib/runtime/gr_top_block.h
gnuradio-core/src/python/gnuradio/gr/__init__.py
gr-audio/examples/c++/CMakeLists.txt
gr-fcd/examples/c++/CMakeLists.txt
grc/python/Port.py
Diffstat (limited to 'gr-fcd/examples')
| -rw-r--r-- | gr-fcd/examples/c++/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-fcd/examples/c++/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index 7ff69777d..47e53cdc8 100644 --- a/gr-fcd/examples/c++/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories( ) add_executable(fcd_nfm_rx fcd_nfm_rx.cc) -target_link_libraries(fcd_nfm_rx gnuradio-fcd) +target_link_libraries(fcd_nfm_rx gnuradio-fcd ${GRAS_LIBRARIES}) INSTALL(TARGETS fcd_nfm_rx |