diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-01-14 16:00:54 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-01-14 16:00:54 -0800 |
| commit | e235f74d48fb8a6967901e6d9a8717381b2e4ce5 (patch) | |
| tree | 59f07792fc78c16583de981b433d9bc165c7eab7 /gnuradio-core/src/python | |
| parent | 9020cc86d3bd88ed5b9c957043567d98dbc0c1a5 (diff) | |
| parent | 45657c97c05763f0b8d1531493ff3d1be923d21a (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt index c5ff2a0c14..bd78c8fb4a 100644 --- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt @@ -43,14 +43,6 @@ 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_SOURCE_DIR}/gruel/src/python - ${CMAKE_BINARY_DIR}/gruel/src/swig - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python/ctrlport - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) |