diff options
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/hier_block2.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt index af18047741..e038422962 100644 --- a/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt @@ -106,10 +106,6 @@ if(ENABLE_GR_CTRLPORT) 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 gruel gnuradio-core) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) endforeach(py_qa_test_file) diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py index 54051e262b..b055edc0b1 100644 --- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py +++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py @@ -20,7 +20,11 @@ # from gnuradio_core import hier_block2_swig -from gruel import pmt + +try: + import pmt +except ImportError: + from gruel import pmt # # This hack forces a 'has-a' relationship to look like an 'is-a' one. |