diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 18:58:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-05 18:58:31 -0400 |
| commit | ac0866b9ca84895ed0496b8abc35b9754cc6b1e6 (patch) | |
| tree | 2721fe08f2082abe80f0ea7879e7a012e91e7bbc /gnuradio-runtime/lib/pmt/CMakeLists.txt | |
| parent | af9da9967a67b08da551a1488e60d3b2f37f5e66 (diff) | |
runtime: (re)creating a pmt shared lib to link against.
This fixes a bug between versions of loaders that pull in the PMT
definitions differently. The symptom is a problem in gr_block_registry
where it creates a PMT dictionary before PMT pointers are known, so
the dictionary's intrusive pointer is invalid.
Diffstat (limited to 'gnuradio-runtime/lib/pmt/CMakeLists.txt')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 9d191df06a..3dc35e43f6 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -74,18 +74,26 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -list(APPEND gnuradio_runtime_sources - ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv.cc - ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cc - ${CMAKE_CURRENT_SOURCE_DIR}/pmt_io.cc - ${CMAKE_CURRENT_SOURCE_DIR}/pmt_pool.cc - ${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc +set(pmt_sources + ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv.cc + ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cc + ${CMAKE_CURRENT_SOURCE_DIR}/pmt_io.cc + ${CMAKE_CURRENT_SOURCE_DIR}/pmt_pool.cc + ${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc +) + +list(APPEND gnuradio_pmt_libs + ${Boost_LIBRARIES} + ${LOG4CPP_LIBRARIES} +) + +add_library(gnuradio-pmt SHARED ${pmt_sources}) +target_link_libraries(gnuradio-pmt ${gnuradio_pmt_libs}) + +GR_LIBRARY_FOO(gnuradio-pmt RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel") + +add_dependencies(gnuradio-pmt + pmt_generated ) -if(ENABLE_TESTING) - list(APPEND test_gnuradio_runtime_sources - ${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.cc - ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt_prims.cc - ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt.cc - ) -endif(ENABLE_TESTING) +# Testing is handled in gnuradio-runtime tests one level down.
\ No newline at end of file |