diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
| commit | e4f0319eced22c112f7e6a4cc45bc2036d285332 (patch) | |
| tree | 92baa4254f47fd0b62d1d3f69e3b1ddb96dd32d3 /gr-noaa | |
| parent | 5fd6b62702369e45ef01a02e12bec1afc5b57200 (diff) | |
| parent | 3e052d303874a07237c4e0c31eef3f7f7a192835 (diff) | |
Merged in 'next' branch.
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_decoder.h | 4 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_deframer.h | 4 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_pll_cf.h | 4 | ||||
| -rw-r--r-- | gr-noaa/swig/CMakeLists.txt | 5 |
5 files changed, 21 insertions, 4 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index cb0c576147..2688d88ded 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -58,28 +58,28 @@ CPACK_COMPONENT("noaa_runtime" GROUP "NOAA" DISPLAY_NAME "Runtime" DESCRIPTION "Runtime" - DEPENDS "core_runtime" + DEPENDS "runtime_runtime" ) CPACK_COMPONENT("noaa_devel" GROUP "NOAA" DISPLAY_NAME "Development" DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "core_devel" + DEPENDS "runtime_devel" ) CPACK_COMPONENT("noaa_python" GROUP "NOAA" DISPLAY_NAME "Python" DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "core_python;noaa_runtime" + DEPENDS "runtime_python;noaa_runtime" ) CPACK_COMPONENT("noaa_swig" GROUP "NOAA" DISPLAY_NAME "SWIG" DESCRIPTION "SWIG development .i files" - DEPENDS "core_swig;noaa_python;noaa_devel" + DEPENDS "runtime_swig;noaa_python;noaa_devel" ) ######################################################################## diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/noaa/hrpt_decoder.h index bfc9b79be6..0eab88375a 100644 --- a/gr-noaa/include/noaa/hrpt_decoder.h +++ b/gr-noaa/include/noaa/hrpt_decoder.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT Decoder + * \ingroup noaa_blk + */ class NOAA_API hrpt_decoder : virtual public gr_sync_block { public: diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/noaa/hrpt_deframer.h index 53a051ede2..4e319b9054 100644 --- a/gr-noaa/include/noaa/hrpt_deframer.h +++ b/gr-noaa/include/noaa/hrpt_deframer.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT Deframer + * \ingroup noaa_blk + */ class NOAA_API hrpt_deframer : virtual public gr_block { public: diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/noaa/hrpt_pll_cf.h index 0e13c01ddd..b9d746b90c 100644 --- a/gr-noaa/include/noaa/hrpt_pll_cf.h +++ b/gr-noaa/include/noaa/hrpt_pll_cf.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT PLL + * \ingroup noaa_blk + */ class NOAA_API hrpt_pll_cf : virtual public gr_sync_block { public: diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt index 829ca4f17d..2bc7c3eb2e 100644 --- a/gr-noaa/swig/CMakeLists.txt +++ b/gr-noaa/swig/CMakeLists.txt @@ -29,6 +29,11 @@ set(GR_SWIG_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ) +if(ENABLE_GR_CTRLPORT) + list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT") + list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) +endif(ENABLE_GR_CTRLPORT) + set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/noaa) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) |