diff options
| author | Tom Rondeau | 2012-04-07 20:03:25 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-04-07 20:03:25 -0400 |
| commit | aaa98c095a85724a8782a28717162c1d30d865c2 (patch) | |
| tree | 14bcfe0dd65c42764966dad44995cc797572a4ce | |
| parent | fdb41fe3399c2282b31297e65f7a020bf844282d (diff) | |
| download | gnuradio-aaa98c095a85724a8782a28717162c1d30d865c2.tar.gz gnuradio-aaa98c095a85724a8782a28717162c1d30d865c2.tar.bz2 gnuradio-aaa98c095a85724a8782a28717162c1d30d865c2.zip | |
gruel and howto: install gruel .i files in gruel dest. Howto will use that dir during build.
howto under both cmake and autotools can be built off cmake or autotools gnuradio builds.
| -rw-r--r-- | gr-howto-write-a-block-cmake/swig/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block/Makefile.common | 3 | ||||
| -rw-r--r-- | gr-howto-write-a-block/config/gr_standalone.m4 | 1 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt index ac5f700f1..1e3e59e2c 100644 --- a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/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) diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common index fca6133c1..2b9cc75af 100644 --- a/gr-howto-write-a-block/Makefile.common +++ b/gr-howto-write-a-block/Makefile.common @@ -56,7 +56,8 @@ STD_DEFINES_AND_INCLUDES = \ $(DEFINES) \ -I$(abs_top_srcdir)/lib \ -I$(GNURADIO_CORE_INCLUDEDIR) \ - -I$(GNURADIO_CORE_INCLUDEDIR)/swig + -I$(GNURADIO_CORE_INCLUDEDIR)/swig \ + -I$(GRUEL_INCLUDEDIR)/gruel/swig # includes modincludedir = $(includedir)/$(modname) diff --git a/gr-howto-write-a-block/config/gr_standalone.m4 b/gr-howto-write-a-block/config/gr_standalone.m4 index beb98204c..5ba48892f 100644 --- a/gr-howto-write-a-block/config/gr_standalone.m4 +++ b/gr-howto-write-a-block/config/gr_standalone.m4 @@ -109,6 +109,7 @@ m4_define([GR_STANDALONE], AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) + PKG_CHECK_MODULES(GRUEL, gruel >= 3) LIBS="$LIBS $GNURADIO_CORE_LIBS" gnuradio_core_GUILE_LOAD_PATH="`pkg-config --variable=guile_load_path gnuradio-core`" diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index 7d69ee549..8b4defc20 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -40,6 +40,6 @@ GR_SWIG_INSTALL( install( FILES gr_intrusive_ptr.i pmt_swig.i ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig + DESTINATION ${GR_INCLUDE_DIR}/gruel/swig COMPONENT "gruel_swig" ) |