diff options
| author | Tom Rondeau | 2012-12-10 13:28:43 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-12-10 13:56:39 -0500 |
| commit | 0dc8f5f3c8d64c8ff6cc0ddcd3374d11776977d4 (patch) | |
| tree | 96a32eb4d82cdb9f075998f1e8da2d29f399bcd1 | |
| parent | 52ca5e2765b7a4532d26502b5b76b7c85c5019d7 (diff) | |
| download | gnuradio-0dc8f5f3c8d64c8ff6cc0ddcd3374d11776977d4.tar.gz gnuradio-0dc8f5f3c8d64c8ff6cc0ddcd3374d11776977d4.tar.bz2 gnuradio-0dc8f5f3c8d64c8ff6cc0ddcd3374d11776977d4.zip | |
core: to make ctest able to import pmts in-tree.
This duplicates a recent change made on next for the same reason:
4aec85d2facecb751ab4f83b934e56a6d59037dd
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/hier_block2.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc076b9e7..4d0e59e70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,6 +232,8 @@ install( ######################################################################## list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-core) list(APPEND 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/lib/swig ) diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py index f5f0c00f5..b95782238 100644 --- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py +++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py @@ -20,7 +20,10 @@ # 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. |