[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'next' into python3

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit b9058f111aeeae175d7ad1ef68405fe62d29a198
Merge: 0476c5f 385f0d4
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 17 17:12:56 2017 -0700

    Merge branch 'next' into python3

 cmake/Modules/GrSwig.cmake                             |  2 +-
 gnuradio-runtime/include/gnuradio/rpcmanager.h         |  4 ++--
 gnuradio-runtime/lib/controlport/rpcserver_selector.cc |  4 ++--
 gnuradio-runtime/lib/thread/thread_group.cc            |  2 +-
 gr-blocks/include/gnuradio/blocks/tag_share.h          | 15 +++++++--------
 gr-blocks/lib/tcp_server_sink_impl.h                   |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --cc cmake/Modules/GrSwig.cmake
index d6103ec,de8be5c..8e45c54
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@@ -177,12 -178,8 +177,12 @@@ macro(GR_SWIG_MAKE name
      include_directories(${GR_SWIG_INCLUDE_DIRS})
      list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${tag_file})
  
 +    if (PYTHON3)
 +        set(py3 "-py3")
 +    endif (PYTHON3)
 +
      #setup the swig flags with flags and include directories
-     set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -relativeimport 
${py3} -module ${name} ${GR_SWIG_FLAGS})
 -    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 -module 
${name} ${GR_SWIG_FLAGS})
++    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 
-relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS})
  
      #set the C++ property on the swig .i file so it builds
      set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)