diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:02:48 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:02:48 -0700 |
| commit | 9806cdfc165652b6b6df2d719780261b903ac223 (patch) | |
| tree | 3a284cd9e896028a2eaafe5c04ccc8c2c14c9309 | |
| parent | d4bb541ec1ec93446ecfa53948a1a6f995fffb64 (diff) | |
| parent | 49df05228540185bdf14309bdcbd3527d6545f79 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcmanager.cc | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 | ||||
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-atsc/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/swig/CMakeLists.txt | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc index a67febe386..fee255498e 100644 --- a/gnuradio-runtime/lib/controlport/rpcmanager.cc +++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc @@ -24,11 +24,6 @@ #include <iostream> #include <stdexcept> -bool rpcmanager::booter_registered(false); -bool rpcmanager::aggregator_registered(false); -std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0); -std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0); - rpcmanager::rpcmanager() {;} rpcmanager::~rpcmanager() {;} diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 8f3b4557c2..fcba1ab524 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -25,6 +25,10 @@ #include <gnuradio/rpcserver_selector.h> bool rpcmanager::make_aggregator(false); +bool rpcmanager::booter_registered(false); +bool rpcmanager::aggregator_registered(false); +std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0); +std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0); #ifdef GR_RPCSERVER_ENABLED rpcmanager manager_instance; diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index ffc74a0b4a..ea5609dd8d 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -28,6 +28,7 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC Boost_FOUND + GSL_FOUND ENABLE_GNURADIO_RUNTIME ENABLE_GR_FFT ENABLE_GR_BLOCKS diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt index 8d02a00c23..d2a70f8a6b 100644 --- a/gr-atsc/swig/CMakeLists.txt +++ b/gr-atsc/swig/CMakeLists.txt @@ -40,7 +40,7 @@ endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/atsc) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) -set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft) +set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft ${GSL_LDFLAGS}) GR_SWIG_MAKE(atsc_swig atsc_swig.i) diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index 5a23482b26..58003da49b 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -29,6 +29,7 @@ include(GrComponent) GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV Boost_FOUND + GSL_FOUND ENABLE_GNURADIO_RUNTIME ENABLE_GR_ANALOG ENABLE_GR_FILTER diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt index 04b8b09ec7..8a91c6a8ac 100644 --- a/gr-dtv/swig/CMakeLists.txt +++ b/gr-dtv/swig/CMakeLists.txt @@ -36,7 +36,7 @@ endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/dtv) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) -set(GR_SWIG_LIBRARIES gnuradio-dtv) +set(GR_SWIG_LIBRARIES gnuradio-dtv ${GSL_LDFLAGS}) GR_SWIG_MAKE(dtv_swig dtv_swig.i) |