From bceb96b021bab0168e501e74ac38c7e31213b1a1 Mon Sep 17 00:00:00 2001
From: Ben Reynwar <ben@reynwar.net>
Date: Mon, 3 Jun 2013 16:12:16 -0700
Subject: uninstalled imports: Fixing up after merge with master.
---
gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt | 4 ++++
gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'gnuradio-runtime')
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index c910433cf7..d1b27e50a7 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@ -32,6 +32,10 @@ EXECUTE_PROCESS(
${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/frontend.ice
)
+EXECUTE_PROCESS(
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/gnuradio-runtime/python/gnuradio/__init__.py
+)
+
GR_PYTHON_INSTALL(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
diff --git a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
index c29ea5df93..b4cf1c5fdf 100644
--- a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
@@ -41,7 +41,7 @@ if(ENABLE_TESTING)
set(GR_TEST_LIBRARY_DIRS "")
set(GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gruel/src/python
- ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+ ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
)
include(GrTest)
file(GLOB py_qa_test_files "qa_*.py")
--
cgit v1.2.3