diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
commit | 527c21cb6a3b1b32610c4acf0bec8956ace2c5bf (patch) | |
tree | 5fdb9e755f77d2493d8851f956b074c6f11cb8ce /docs/doxygen/other/build_guide.dox | |
parent | 7765798c48b9ec4b1cda43367e97eb778a8ad758 (diff) | |
parent | b092142302bcf8c771ec68e61da7781eb406c86f (diff) |
Merge branch 'master' into next
Diffstat (limited to 'docs/doxygen/other/build_guide.dox')
-rw-r--r-- | docs/doxygen/other/build_guide.dox | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox index c21b9874ac..ebf47dc7e2 100644 --- a/docs/doxygen/other/build_guide.dox +++ b/docs/doxygen/other/build_guide.dox @@ -63,7 +63,7 @@ first. Most recent systems have these packages available. \li audio-osx \li audio-windows -* Optional but recommended dependencies. +<b>Optional but recommended dependencies.</b> It is not necessary to satisfy all of these dependencies; just the one(s) that are right for your system. On Linux, don't expect @@ -82,6 +82,17 @@ audio-osx and audio-windows to be either satisfied or built. \li log4cpp (>= 1.0) http://log4cpp.sourceforge.net/ +<b>Optional</b> + +\ref page_ctrlport may use various backends to perform the RPC +process, and each is its own dependency. + +Currently, ControlPort only supports the Apache Thrift backend. + +\li thrift (>= 0.9.2) https://thrift.apache.org/ + + + \section build_gr_cmake Building GNU Radio GNU Radio is built using the CMake build system |