diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-09 12:31:10 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-09 12:31:10 -0400 |
| commit | 1cda71b76f2cb08e0a52511ad89f4703a6c3444e (patch) | |
| tree | ddf6de6f69ae72b85546c122475a9ac0c784253a | |
| parent | 67688d9427d9e0a3323968a6b57864f113b78c64 (diff) | |
| parent | 1601bf277002f0f83f34d672d18360d4982befad (diff) | |
Merge branch 'master' into next
Conflicts and fixes for 3.7:
gr-utils/python/modtool/gr-newmod/CMakeLists.txt
| -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() |