diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
| commit | 792302fbdfa37cf680234353dbe973886c4b2898 (patch) | |
| tree | e999bcf6dbfe12cf19ae49b1762cd71d724aa8ae /gr-utils/python | |
| parent | a7adf4689b58d91bd88d0dc948b017e1d42bff01 (diff) | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
Merge branch 'next' into runtime_pimpl
Catches up runtime_pimpl branch with changes on next since
the initial branch start.
Conflicts:
gnuradio-runtime/include/gnuradio/constants.h
gnuradio-runtime/include/gnuradio/tags.h
gnuradio-runtime/include/gr_block_detail.h
gnuradio-runtime/include/gr_buffer.h
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block.cc
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_block_executor.cc
gnuradio-runtime/lib/gr_buffer.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-blocks/lib/interleaved_short_to_complex_impl.cc
Diffstat (limited to 'gr-utils/python')
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index 33f67c0442..6f01385e84 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -86,10 +86,17 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) find_package(GnuradioRuntime) find_package(CppUnit) +# To run a more advanced search for GNU Radio and it's components and +# versions, use the following. Add any components required to the list +# of GR_REQUIRED_COMPONENTS (in all caps) and change "version" to the +# minimum API compatible version required. +# +# set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER ...) +# find_package(Gnuradio "version") + if(NOT GNURADIO_RUNTIME_FOUND) message(FATAL_ERROR "GnuRadio Runtime required to compile howto") endif() - if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile howto") endif() |