3 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b5b48d2d1..3776a3e9a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,10 +260,17 @@ list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-runtime)
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/python
     ${CMAKE_BINARY_DIR}/gruel/src/swig
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
     ${CMAKE_SOURCE_DIR}/gnuradio-runtime/python
     ${CMAKE_BINARY_DIR}/gnuradio-runtime/swig
 )
 
+# Note that above we put the binary gnuradio-runtime/python directory
+# before the source directory. This is due to a quirk with ControlPort
+# and how slice generates files and names. We want the QA and
+# installed code to import the same names, so we have to grab from the
+# binary directory first.
+
 ########################################################################
 # Add subdirectories (in order of deps)
 ########################################################################
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt
index 57982f4947..483f3e7c2f 100644
--- a/gnuradio-runtime/swig/CMakeLists.txt
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -32,6 +32,8 @@ set(GR_SWIG_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
 )
 
+link_directories(${Boost_LIBRARY_DIRS})
+
 set(GR_SWIG_LIBRARIES
     gnuradio-runtime
     ${LOG4CPP_LIBRARIES}
@@ -52,8 +54,6 @@ endif(ENABLE_GR_CTRLPORT)
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
 
-link_directories(${Boost_LIBRARY_DIRS})
-
 set(GR_SWIG_TARGET_DEPS 
   pmt_swig
   ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i
diff --git a/gr-blocks/python/CMakeLists.txt b/gr-blocks/python/CMakeLists.txt
index a9c2fe7b6f..841588799b 100644
--- a/gr-blocks/python/CMakeLists.txt
+++ b/gr-blocks/python/CMakeLists.txt
@@ -37,7 +37,6 @@ if(ENABLE_TESTING)
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_BINARY_DIR}/gr-blocks/python
     ${CMAKE_BINARY_DIR}/gr-blocks/swig
-    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
 )
 list(APPEND GR_TEST_TARGET_DEPS gnuradio-blocks)