[Commit-gnuradio] [gnuradio] 01/01: 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 7ed6005b9282f628754de9fdd565260805be4abe
Merge: 1931bd3 99d24d2
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 22 09:25:19 2017 -0700

    Merge branch 'next' into python3
    
    Conflicts:
        cmake/Modules/GrSwig.cmake

 cmake/Modules/GrSwig.cmake           | 4 ----
 cmake/Modules/UseSWIG.cmake          | 1 +
 gnuradio-runtime/CMakeLists.txt      | 3 +--
 gnuradio-runtime/lib/CMakeLists.txt  | 5 -----
 gnuradio-runtime/swig/CMakeLists.txt | 1 -
 gr-analog/CMakeLists.txt             | 1 +
 gr-audio/lib/CMakeLists.txt          | 4 +---
 gr-blocks/CMakeLists.txt             | 2 ++
 gr-blocks/lib/CMakeLists.txt         | 4 ----
 gr-blocks/tests/CMakeLists.txt       | 6 +-----
 gr-comedi/lib/CMakeLists.txt         | 2 --
 gr-digital/CMakeLists.txt            | 2 --
 gr-digital/lib/CMakeLists.txt        | 4 ----
 gr-dtv/CMakeLists.txt                | 1 +
 gr-dtv/lib/CMakeLists.txt            | 5 -----
 gr-fec/lib/CMakeLists.txt            | 7 ++-----
 gr-fft/CMakeLists.txt                | 1 -
 gr-filter/lib/CMakeLists.txt         | 2 --
 gr-qtgui/lib/CMakeLists.txt          | 3 ---
 gr-trellis/lib/CMakeLists.txt        | 2 --
 gr-uhd/lib/CMakeLists.txt            | 6 ------
 gr-video-sdl/lib/CMakeLists.txt      | 2 --
 gr-vocoder/lib/CMakeLists.txt        | 6 ------
 gr-wavelet/CMakeLists.txt            | 3 ---
 gr-wavelet/lib/CMakeLists.txt        | 7 -------
 25 files changed, 10 insertions(+), 74 deletions(-)

diff --cc cmake/Modules/GrSwig.cmake
index cc6860c,b2eabd5..d6103ec
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@@ -177,17 -178,9 +177,13 @@@ 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 -module ${name} 
${GR_SWIG_FLAGS})
 +    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -relativeimport 
${py3} -module ${name} ${GR_SWIG_FLAGS})
  
-     foreach(dir ${GR_SWIG_INCLUDE_DIRS})
-         list(APPEND CMAKE_SWIG_FLAGS "-I${dir}")
-     endforeach(dir)
- 
      #set the C++ property on the swig .i file so it builds
      set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)