From 4aec85d2facecb751ab4f83b934e56a6d59037dd Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 7 Dec 2012 19:36:43 -0500
Subject: build: fixes to build with PMTs and ControlPort.
---
gnuradio-core/src/lib/runtime/gr_basic_block.h | 2 +-
gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt | 4 ----
gnuradio-core/src/python/gnuradio/gr/hier_block2.py | 6 +++++-
3 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index 40f08489a9..33528f2b2f 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -233,6 +233,7 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_
{
d_rpc_vars.push_back(s);
}
+#endif /* GR_CTRLPORT */
/*!
* \brief Set up the RPC registered variables.
@@ -243,7 +244,6 @@ class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_
* (rpcbasic_sptr(...)) and stored using add_rpc_variable.
*/
virtual void setup_rpc() {};
-#endif /* GR_CTRLPORT */
/*!
* \brief Confirm that ninputs and noutputs is an acceptable combination.
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.
--
cgit v1.2.3