diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-04-07 20:05:10 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-07 20:05:10 -0400 |
commit | ef9d7dee4fb30f1961bcbfb1142b498b749ebd9a (patch) | |
tree | a6c1329bb902c95c8ab9970f38ec5fb46d79167c /gr-howto-write-a-block | |
parent | b2f8b4269558cdca3741ad9f3b6a9ee9114b1a8a (diff) | |
parent | 7097d4b8428088c86ef99bc90b8da67674f4ab8c (diff) |
Merge branch 'master' into next
Conflicts:
gr-howto-write-a-block/Makefile.common
gr-howto-write-a-block/config/gr_standalone.m4
Diffstat (limited to 'gr-howto-write-a-block')
-rw-r--r-- | gr-howto-write-a-block/swig/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-howto-write-a-block/swig/CMakeLists.txt b/gr-howto-write-a-block/swig/CMakeLists.txt index ac5f700f14..1e3e59e2c4 100644 --- a/gr-howto-write-a-block/swig/CMakeLists.txt +++ b/gr-howto-write-a-block/swig/CMakeLists.txt @@ -35,6 +35,10 @@ foreach(incdir ${GNURADIO_CORE_INCLUDE_DIRS}) list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig) endforeach(incdir) +foreach(incdir ${GRUEL_INCLUDE_DIRS}) + list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gruel/swig) +endforeach(incdir) + set(GR_SWIG_LIBRARIES gnuradio-howto) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/howto_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) |