diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-11 16:01:12 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-11 16:01:12 -0400 |
| commit | b0a72b4f06f9a21f0ba5d80fc27a0940fad66dbf (patch) | |
| tree | e9ed6c2297699611b58b40afb0076c1803792b63 | |
| parent | ded480efed91be8fa80938c0ea5474990e2f7302 (diff) | |
| parent | 45f12cf0031cdf594dff8a9bfc7db395cd39ca37 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h | 8 | ||||
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h index 86650a741c..0999dea747 100644 --- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h +++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h @@ -30,6 +30,11 @@ #include <gnuradio/rpcmanager.h> #include <gnuradio/rpcserver_selector.h> #include <gnuradio/rpcserver_base.h> + +// Fixes circular dependency issue before including block_registry.h +class rpcbasic_base; +typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr; + #include <gnuradio/block_registry.h> @@ -585,9 +590,6 @@ public: }; -typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr; - - /********************************************************************* * RPC Register Set Classes diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index 9121dd41b8..f926b81332 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -76,3 +76,16 @@ list(APPEND uhd_libs add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) target_link_libraries(gnuradio-uhd ${uhd_libs}) GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel") + +if(ENABLE_STATIC_LIBS) + add_library(gnuradio-uhd_static STATIC ${uhd_sources}) + + if(NOT WIN32) + set_target_properties(gnuradio-uhd_static + PROPERTIES OUTPUT_NAME gnuradio-uhd) + endif(NOT WIN32) + + install(TARGETS gnuradio-uhd_static + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "uhd_devel" # .lib file + ) +endif(ENABLE_STATIC_LIBS)
\ No newline at end of file |