diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
| commit | 0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch) | |
| tree | d4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-fcd/lib/CMakeLists.txt | |
| parent | 4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff) | |
| parent | c805168975a30af962fbd0a25c091d7b2113394e (diff) | |
Merge branch 'next_blocks' into next
Conflicts:
gr-trellis/CMakeLists.txt
gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-fcd/lib/CMakeLists.txt')
| -rw-r--r-- | gr-fcd/lib/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt index 9a5605d99c..dd0778deef 100644 --- a/gr-fcd/lib/CMakeLists.txt +++ b/gr-fcd/lib/CMakeLists.txt @@ -26,6 +26,7 @@ GR_INCLUDE_SUBDIRECTORY(fcd) include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_FCD_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} ${GR_AUDIO_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/hid ${CMAKE_CURRENT_SOURCE_DIR}/fcd @@ -44,6 +45,7 @@ list(APPEND gr_fcd_sources list(APPEND fcd_libs gnuradio-core + gnuradio-blocks gnuradio-audio ${Boost_LIBRARIES} ) |