diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
| commit | ce211603ff8821b50f7c9ebc3931498c6f2bd374 (patch) | |
| tree | dd8b92841ef4cd0728aa1156b105e7173286627b /gr-trellis/src | |
| parent | 6121d0b12bcb308586b5888b6c7e82832f692e5c (diff) | |
| parent | 4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (diff) | |
Merge branch 'master' into gr_log
Conflicts:
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/main_page.dox
gnuradio-core/gnuradio-core.conf.in
gnuradio-core/src/lib/swig/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-howto-write-a-block/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-video-sdl/src/CMakeLists.txt
Diffstat (limited to 'gr-trellis/src')
| -rw-r--r-- | gr-trellis/src/lib/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | gr-trellis/src/python/CMakeLists.txt | 17 |
2 files changed, 15 insertions, 13 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt index be7baa785d..2fd4247a6d 100644 --- a/gr-trellis/src/lib/CMakeLists.txt +++ b/gr-trellis/src/lib/CMakeLists.txt @@ -23,12 +23,13 @@ include(GrPython) # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_TRELLIS_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) include_directories(${LOG4CXX_INCLUDE_DIRS}) @@ -202,16 +203,16 @@ if(ENABLE_PYTHON) include(GrPython) include(GrSwig) -set(GR_SWIG_TARGET_DEPS core_swig) - set(GR_SWIG_SOURCE_DEPS ${generated_trellis_includes} ${generated_trellis_swigs} ) set(GR_SWIG_INCLUDE_DIRS ${GR_TRELLIS_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_DIGITAL_SWIG_INCLUDE_DIRS} + ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i) diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt index ae2ab9cb41..f8e4d95329 100644 --- a/gr-trellis/src/python/CMakeLists.txt +++ b/gr-trellis/src/python/CMakeLists.txt @@ -21,17 +21,18 @@ # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-digital/swig + ${CMAKE_BINARY_DIR}/gr-trellis/src/lib +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-trellis) + +include(GrPython) include(GrTest) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - set(GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig - ${CMAKE_BINARY_DIR}/gr-digital/swig - ${CMAKE_BINARY_DIR}/gr-trellis/src/lib - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital gnuradio-trellis) - GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) + GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) |