[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 d5777e144390ad15145c6ed30473e8bd923ae5ab
Merge: 7ed6005 9d24861
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 26 19:04:17 2017 -0700

    Merge branch 'next' into python3
    
    Conflicts:
        CMakeLists.txt

 CMakeLists.txt                                     | 140 ++++++++++++++-------
 cmake/Modules/GrBoost.cmake                        |   4 +-
 docs/doxygen/CMakeLists.txt                        |   4 +
 .../other/{build_guide.dox => build_guide.dox.in}  |  34 +++--
 4 files changed, 124 insertions(+), 58 deletions(-)

diff --cc CMakeLists.txt
index 7e59044,1a33b06..d75a162
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -283,11 -342,7 +342,9 @@@ include(GrBoost
  ########################################################################
  # Enable python component
  ########################################################################
- 
 +include(GrPython)
- 
+ find_package(PythonLibs ${GR_PYTHON_MIN_VERSION})
 +GR_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six 
"True" SIX_FOUND)
- 
  find_package(SWIG)
  
  if(SWIG_FOUND)
@@@ -305,10 -357,9 +359,10 @@@ GR_REGISTER_COMPONENT("python-support" 
      PYTHONLIBS_FOUND
      SWIG_FOUND
      SWIG_VERSION_CHECK
 +    SIX_FOUND
  )
  
- find_package(CppUnit)
+ find_package(CppUnit ${GR_CPPUNIT_MIN_VERSION})
  GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING
      CPPUNIT_FOUND
  )