diff options
| author | Johnathan Corgan | 2012-11-14 09:34:01 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-11-14 09:34:01 -0800 |
| commit | 0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca (patch) | |
| tree | a85e79f623be99e709906cefc20e09020c7a19f5 /gnuradio-core/src | |
| parent | 973a21382f2bb64ebe426886a01a67d62816e54c (diff) | |
| parent | 64913ee414f2c8a51afb2277b16b957fa2e7e066 (diff) | |
| download | gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.tar.gz gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.tar.bz2 gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.zip | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gnuradio-core/src/tests/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt index 3e75ead03..6a0555021 100644 --- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt @@ -42,11 +42,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_BINARY_DIR}/gnuradio-core/src/python - ${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) diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt index 3c7f632b3..680141e7b 100644 --- a/gnuradio-core/src/tests/CMakeLists.txt +++ b/gnuradio-core/src/tests/CMakeLists.txt @@ -63,7 +63,7 @@ endforeach(test_not_run_src) # Set the test environment so the build libs will be found under MSVC. ######################################################################## include(GrTest) -set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core test-gnuradio-core) +list(APPEND GR_TEST_TARGET_DEPS test-gnuradio-core) add_executable(gr_core_test_all test_all.cc) target_link_libraries(gr_core_test_all test-gnuradio-core) GR_ADD_TEST(gr-core-test-all gr_core_test_all) |