[Commit-gnuradio] [gnuradio] 03/04: Use GR_*_MIN_VERSION cmake variables from PR #1215

[git]

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

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit 069057ccf7099ae323dbb3d6f742b0bee55f7fd8
Author: Douglas Anderson <address@hidden>
Date:   Thu Mar 30 13:24:03 2017 -0600

    Use GR_*_MIN_VERSION cmake variables from PR #1215
---
 cmake/Modules/GrPython.cmake | 4 ++--
 gr-utils/CMakeLists.txt      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake
index 42d9804..fdbd21d 100644
--- a/cmake/Modules/GrPython.cmake
+++ b/cmake/Modules/GrPython.cmake
@@ -30,11 +30,11 @@ set(__INCLUDED_GR_PYTHON_CMAKE TRUE)
 
 if (PYTHON_EXECUTABLE)
     message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
-    find_package(PythonInterp 2.7 REQUIRED)
+    find_package(PythonInterp ${GR_PYTHON_MIN_VERSION} REQUIRED)
 else (PYTHON_EXECUTABLE)
     message(STATUS "PYTHON_EXECUTABLE not set - using default python3")
     message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python2 to build for 
python2.")
-    find_package(PythonInterp 3.4 REQUIRED)
+    find_package(PythonInterp ${GR_PYTHON3_MIN_VERSION} REQUIRED)
 endif (PYTHON_EXECUTABLE)
 
 if (${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3)
diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
index d54a06a..a8dfd91 100644
--- a/gr-utils/CMakeLists.txt
+++ b/gr-utils/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include(GrPython)
 
-GR_PYTHON_CHECK_MODULE("Mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" 
MAKO_FOUND)
+GR_PYTHON_CHECK_MODULE("Mako >= ${GR_MAKO_MIN_VERSION}" mako "mako.__version__ 
>= '${GR_MAKO_MIN_VERSION}'" MAKO_FOUND)
 
 ########################################################################
 # Register component