diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-09 12:00:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-09 12:00:46 -0700 |
| commit | 0442f56a40c82a67705a108cdbbbedc85a84dc1d (patch) | |
| tree | b570ea5c96304f3b38d9657a0b14c3e288fa8202 /gnuradio-runtime/lib/pmt/CMakeLists.txt | |
| parent | 52d7f2bdb1e27cb43754d46edf1c7a8942853ae7 (diff) | |
| parent | ac0866b9ca84895ed0496b8abc35b9754cc6b1e6 (diff) | |
Merge remote-tracking branch 'tom/next' into next
Conflicts:
gnuradio-runtime/lib/pmt/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/pmt/CMakeLists.txt')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 3c1a2dec03..30a62ead7f 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -72,21 +72,27 @@ 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. -add_custom_target(pmt_generated - DEPENDS ${PMT_SERIAL_TAGS_H} ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h) |