diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-01-07 11:55:54 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-01-07 11:55:54 -0500 |
commit | 42a1a86ac9548e810ad64c01a75fcea8c37831bf (patch) | |
tree | a307e9b8436db48e810e5f81184185896ac2c099 /gr-vocoder | |
parent | 7bee8dfbe234c8caf0c1033ebd71040355fcb838 (diff) | |
parent | a5dcd13eee561f74715ea537ec93dabfcc24039b (diff) |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gr-vocoder')
-rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 5 | ||||
-rw-r--r-- | gr-vocoder/swig/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index d648efdf87..7949e227b7 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -21,11 +21,12 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_VOCODER_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt index 8be66a5dda..3a60cdf7bb 100644 --- a/gr-vocoder/swig/CMakeLists.txt +++ b/gr-vocoder/swig/CMakeLists.txt @@ -26,6 +26,8 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_VOCODER_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i) |