[Commit-gnuradio] [gnuradio] 01/02: Bumped SWIG minimal SWIG version to 2.0.4

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fc7486d9a8b91bae9a94d40c5e0372ffc43b47fc
Author: Marcus Müller <address@hidden>
Date:   Fri Mar 10 08:52:19 2017 +0100

    Bumped SWIG minimal SWIG version to 2.0.4
---
 CMakeLists.txt                  |  6 ++++--
 cmake/Modules/FindSWIG.cmake    |  4 ++--
 gnuradio-runtime/CMakeLists.txt | 10 ----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b454ad5..eab6d9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,9 +287,11 @@ find_package(PythonLibs 2)
 find_package(SWIG)
 
 if(SWIG_FOUND)
-    # Minimum SWIG version required is 1.3.31
+  # Minimum SWIG version required is 2.0.4
+  # Recommended revisit: EOL of Ubuntu 12.04 LTS, bump to 2.0.7
+  # see https://github.com/gnuradio/gnuradio/issues/1222
     set(SWIG_VERSION_CHECK FALSE)
-    if("${SWIG_VERSION}" VERSION_GREATER "1.3.30")
+    if("${SWIG_VERSION}" VERSION_GREATER "2.0.3")
         set(SWIG_VERSION_CHECK TRUE)
     endif()
 endif(SWIG_FOUND)
diff --git a/cmake/Modules/FindSWIG.cmake b/cmake/Modules/FindSWIG.cmake
index 156bd5e..ed1ac93 100644
--- a/cmake/Modules/FindSWIG.cmake
+++ b/cmake/Modules/FindSWIG.cmake
@@ -86,7 +86,7 @@ if(SWIG_FOUND)
 
   # SWIG was found; make sure the version meets GR's needs
   message(STATUS "Found SWIG version ${SWIG_VERSION}.")
-  if("${SWIG_VERSION}" VERSION_GREATER "1.3.30")
+  if("${SWIG_VERSION}" VERSION_GREATER "2.0.3")
     if(NOT "${SWIG_VERSION}" VERSION_EQUAL "3.0.3" AND
        NOT "${SWIG_VERSION}" VERSION_EQUAL "3.0.4")
       set(SWIG_VERSION_CHECK TRUE)
@@ -94,7 +94,7 @@ if(SWIG_FOUND)
       message(STATUS "SWIG versions 3.0.3 and 3.0.4 fail to work with GNU 
Radio.")
     endif()
   else()
-    message(STATUS "Minimum SWIG version required is 1.3.31 for GNU Radio.")
+    message(STATUS "Minimum SWIG version required is 2.0.4 for GNU Radio.")
   endif()
 
 else()
diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt
index 7660642..17fc61e 100644
--- a/gnuradio-runtime/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@ -62,16 +62,6 @@ GR_SET_GLOBAL(GNURADIO_RUNTIME_PYTHONPATH 
${GNURADIO_RUNTIME_PYTHONPATH})
 
 FIND_PACKAGE(SWIG)
 
-if(SWIG_FOUND)
-  set(SWIG_VERSION_CHECK FALSE)
-  if("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
-    set(SWIG_VERSION_CHECK TRUE)
-  else("${SWIG_VERSION}" VERSION_GREATER "2.0.0")
-    message(STATUS "")
-    message(STATUS "Ctrlport requires SWIG version >= 2.0")
-  endif()
-endif(SWIG_FOUND)
-
 GR_REGISTER_COMPONENT("gr-ctrlport" ENABLE_GR_CTRLPORT
   Boost_FOUND
   SWIG_FOUND