casa-mp-base
Public
Commits
Michael Dickens authored 983f74a80a8
| 1 - | --- gnuradio-runtime/lib/CMakeLists.txt.orig |
| 2 - | +++ gnuradio-runtime/lib/CMakeLists.txt |
| 3 - | |
| 4 - | list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) |
| 5 - | |
| 6 - | ######################################################################## |
| 7 - | -# Setup the include and linker paths |
| 8 - | +# Setup globally used include paths |
| 9 - | ######################################################################## |
| 10 - | include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS} |
| 11 - | ${CMAKE_CURRENT_SOURCE_DIR} |
| 12 - | |
| 13 - | ${MPLIB_INCLUDE_DIRS} |
| 14 - | ) |
| 15 - | |
| 16 - | -if(ENABLE_CTRLPORT_THRIFT) |
| 17 - | - list(APPEND include_directories |
| 18 - | - ${THRIFT_INCLUDE_DIRS} |
| 19 - | - ) |
| 20 - | -endif(ENABLE_CTRLPORT_THRIFT) |
| 21 - | - |
| 22 - | ######################################################################## |
| 23 - | # Include subdirs rather to populate to the sources lists. |
| 24 - | ######################################################################## |
| 25 - | |
| 26 - | GR_INCLUDE_SUBDIRECTORY(math) |
| 27 - | GR_INCLUDE_SUBDIRECTORY(controlport) |
| 28 - | |
| 29 - | +######################################################################## |
| 30 - | +# Setup CTRLPORT include path, if using |
| 31 - | +######################################################################## |
| 32 - | +if(ENABLE_CTRLPORT_THRIFT) |
| 33 - | + include_directories(${THRIFT_INCLUDE_DIRS}) |
| 34 - | +endif(ENABLE_CTRLPORT_THRIFT) |
| 35 - | + |
| 36 - | ######################################################################## |
| 37 - | # Setup library |
| 38 - | ######################################################################## |
| 39 - | --- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig |
| 40 - | +++ gnuradio-runtime/lib/controlport/CMakeLists.txt |
| 41 - | |
| 42 - | # the Free Software Foundation, Inc., 51 Franklin Street, |
| 43 - | # Boston, MA 02110-1301, USA. |
| 44 - | |
| 45 - | -if(ENABLE_GR_CTRLPORT) |
| 46 - | - |
| 47 - | # Keep track of the number of backends ControlPort supports |
| 48 - | SET(CTRLPORT_BACKENDS 0) |
| 49 - | |
| 50 - | +if(ENABLE_GR_CTRLPORT) |
| 51 - | + |
| 52 - | # Add definition so we can compile in ControlPort to the blocks. |
| 53 - | add_definitions(-DGR_CTRLPORT) |
| 54 - | |
| 55 - | -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) |
| 56 - | +include_directories( |
| 57 - | + ${CMAKE_CURRENT_SOURCE_DIR} |
| 58 - | + ${CMAKE_CURRENT_BINARY_DIR} |
| 59 - | +) |
| 60 - | |
| 61 - | list(APPEND gnuradio_ctrlport_sources |
| 62 - | ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc |
| 63 - | |
| 64 - | ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc |
| 65 - | ) |
| 66 - | |
| 67 - | - |
| 68 - | OPTION(ENABLE_CTRLPORT_THRIFT "Enable ControlPort Thrift support" ON) |
| 69 - | |
| 70 - | if(ENABLE_CTRLPORT_THRIFT) |
| 71 - | |
| 72 - | |
| 73 - | endif(THRIFT_FOUND) |
| 74 - | endif(ENABLE_CTRLPORT_THRIFT) |
| 75 - | - |
| 76 - | -######################################################################## |
| 77 - | -# Add controlport stuff to gnuradio-runtime |
| 78 - | -######################################################################## |
| 79 - | - |
| 80 - | -include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
| 81 - | +endif(ENABLE_GR_CTRLPORT) |
| 82 - | |
| 83 - | # Save the number of backends for testing against later |
| 84 - | set( |
| 85 - | CTRLPORT_BACKENDS ${CTRLPORT_BACKENDS} |
| 86 - | CACHE INTERNAL "Number of ControlPort backends available" |
| 87 - | ) |
| 88 - | - |
| 89 - | -endif(ENABLE_GR_CTRLPORT) |
| 90 1 | --- gr-blocks/python/blocks/CMakeLists.txt.orig |
| 91 2 | +++ gr-blocks/python/blocks/CMakeLists.txt |
| 92 - | |
| 3 + | |
| 4 + | include(GrTest) |
| 93 5 | file(GLOB py_qa_test_files "qa_*.py") |
| 94 6 | |
| 95 - | # Force out the controlport QA tests if we have no backends to use. |
| 7 + | - # Force out the controlport QA tests if we have no backends to use. |
| 96 8 | - if(CTRLPORT_BACKENDS EQUAL 0) |
| 97 - | + if(NOT ENABLE_GR_CTRLPORT) |
| 9 + | + # Force out the controlport QA tests if CTRLPORT is not enabled or |
| 10 + | + # if it is enabled but we have no backends to use. |
| 11 + | + if(NOT ENABLE_GR_CTRLPORT OR CTRLPORT_BACKENDS EQUAL 0) |
| 98 12 | list(REMOVE_ITEM py_qa_test_files |
| 99 13 | ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py |
| 100 14 | ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py |
| 101 15 | ${CMAKE_CURRENT_SOURCE_DIR}/qa_ctrlport_probes.py |
| 102 16 | ) |
| 103 17 | - endif(CTRLPORT_BACKENDS EQUAL 0) |
| 104 - | + endif(NOT ENABLE_GR_CTRLPORT) |
| 18 + | + endif(NOT ENABLE_GR_CTRLPORT OR CTRLPORT_BACKENDS EQUAL 0) |
| 105 19 | |
| 106 20 | foreach(py_qa_test_file ${py_qa_test_files}) |
| 107 21 | get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) |