diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-04 11:36:38 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-04 11:36:38 -0500 |
| commit | e0d7e5251ed968007664a0c0314dd845381e8c76 (patch) | |
| tree | 1a1d84a1049778e875a201ee04e4dcc0db246ac2 /gr-digital | |
| parent | 649cdc20c9c33857fdcea3c94d91ed88ac6caae8 (diff) | |
ctrlport: cleaning up contorlport builds.
I was getting confused with where ENABLE_GR_CTRLPORT was used, so this uses that in cmake and GR_CTRLPORT for the C++ and Swig files.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_ccf_impl.cc | 4 | ||||
| -rw-r--r-- | gr-digital/swig/CMakeLists.txt | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index b25d5754a2..c5d9a63189 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -34,7 +34,7 @@ include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) - GR_ADD_COND_DEF(ENABLE_GR_CTRLPORT) + ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) ######################################################################## diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index 815ef3cfdd..2d1a96a3ee 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -458,7 +458,7 @@ namespace gr { void pfb_clock_sync_ccf_impl::setup_rpc() { -#ifdef ENABLE_GR_CTRLPORT +#ifdef GR_CTRLPORT // Getters add_rpc_variable( rpcbasic_sptr(new rpcbasic_register_get<pfb_clock_sync_ccf_impl, float>( @@ -500,7 +500,7 @@ namespace gr { pmt::mp(0.0f), pmt::mp(1.0f), pmt::mp(0.0f), "", "Loop bandwidth", RPC_PRIVLVL_MIN, DISPNULL))); -#endif /* ENABLE_GR_CTRLPORT */ +#endif /* GR_CTRLPORT */ } } /* namespace digital */ diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index 58b95fa69b..14fe6c3a10 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -33,11 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS set(GR_SWIG_LIBRARIES gnuradio-digital gnuradio-filter) if(ENABLE_GR_CTRLPORT) - set(GR_SWIG_INCLUDE_DIRS ${GR_SWIG_INCLUDE_DIRS} - ${GR_CTRLPORT_INCLUDE_DIRS} - ) - - set(GR_SWIG_LIBRARIES ${GR_SWIG_LIBRARIES} gnuradio-ctrlport) + ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_TARGET_DEPS digital_generated_includes core_swig) |