diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-02-20 17:14:03 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-04-02 15:38:56 -0700 |
| commit | 1875c3381bc4e2d2468f9dfe44557cd2a94d5e1c (patch) | |
| tree | a1bb1f3374735d59abf94fa877b8521d15613591 /gnuradio-runtime/lib/controlport/rpcserver_selector.cc | |
| parent | 61864555b687d918b1bd4772fa12c83a29e78abf (diff) | |
controlport: Addes a FindThrift cmake module to find the Thrift headers, libraries, and Python files.
Also adds a ENABLE_CTRLPORT_THRIFT option to cmake so we can turn off Thrift even if it's found installed on the system. We will do this for any backend to provide maximum control over what is used and not used.
This changes how the RPC selector mechanism works; we now set the available RPCs in the config.h file instead of just by hand in the rpcserver_selector.h code.
Finally, cmake displays the backend as a submodule of gr-ctrlport when summarizing what is being built for GNU Radio so we know which backends are or are not being used.
Diffstat (limited to 'gnuradio-runtime/lib/controlport/rpcserver_selector.cc')
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 199610169f..57b42ca4b6 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -26,19 +26,19 @@ bool rpcmanager::make_aggregator(false); -#ifdef RPCSERVER_ICE +#ifdef GR_RPCSERVER_ICE #error TODO ICE #endif -#ifdef RPCSERVER_THRIFT +#ifdef GR_RPCSERVER_THRIFT #include <gnuradio/rpcserver_booter_thrift.h> rpcmanager::rpcserver_booter_register_helper<rpcserver_booter_thrift> boot_thrift; #endif -#ifdef RPCSERVER_ERLANG +#ifdef GR_RPCSERVER_ERLANG #error TODO ERLANG #endif -#ifdef RPCSERVER_XMLRPC +#ifdef GR_RPCSERVER_XMLRPC #error TODO XMLRPC #endif |