diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-26 20:18:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-26 20:18:53 -0700 |
| commit | 26dceecc80390f10cedb94bd9e4fd655827d7f17 (patch) | |
| tree | f88cb2995133048b4a2191bae688fa09b33a19ae /gr-howto-write-a-block | |
| parent | 9bbbda510c265b211b5b571db79ba259c67ee049 (diff) | |
runtime: migrate remaining gnuradio-core contents into gnuradio-runtime
Diffstat (limited to 'gr-howto-write-a-block')
| -rw-r--r-- | gr-howto-write-a-block/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake | 6 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/howto_swig.i | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gr-howto-write-a-block/CMakeLists.txt b/gr-howto-write-a-block/CMakeLists.txt index 760a7b62ea..b49c1e0034 100644 --- a/gr-howto-write-a-block/CMakeLists.txt +++ b/gr-howto-write-a-block/CMakeLists.txt @@ -108,7 +108,7 @@ GR_LOGGING() ######################################################################## include_directories( ${CMAKE_SOURCE_DIR}/include - ${GNURADIO_CORE_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} diff --git a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake index 3773588a70..f32bf5c392 100644 --- a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake @@ -2,7 +2,7 @@ INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) FIND_PATH( - GNURADIO_CORE_INCLUDE_DIRS + GNURADIO_RUNTIME_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio ${PC_GNURADIO_CORE_INCLUDEDIR} @@ -22,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) -MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS) +MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS) diff --git a/gr-howto-write-a-block/swig/CMakeLists.txt b/gr-howto-write-a-block/swig/CMakeLists.txt index 4d5f1156e3..6e0df5336a 100644 --- a/gr-howto-write-a-block/swig/CMakeLists.txt +++ b/gr-howto-write-a-block/swig/CMakeLists.txt @@ -31,7 +31,7 @@ include(GrPython) ######################################################################## # Setup swig generation ######################################################################## -foreach(incdir ${GNURADIO_CORE_INCLUDE_DIRS}) +foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS}) list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig) endforeach(incdir) diff --git a/gr-howto-write-a-block/swig/howto_swig.i b/gr-howto-write-a-block/swig/howto_swig.i index 162bc6a901..0c806daa40 100644 --- a/gr-howto-write-a-block/swig/howto_swig.i +++ b/gr-howto-write-a-block/swig/howto_swig.i @@ -2,7 +2,7 @@ #define HOWTO_API -%include "gnuradio.i" // the common stuff +%include "runtime_swig.i" // the common stuff //load generated python docstrings %include "howto_swig_doc.i" |