[hamradio-commits] [gnss-sdr] 200/303: Relax version of required python-mako

[Carles Fernandez]

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

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 6bac6ece4d3687474d72c9fe31e6f2f574d2bf4c
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Dec 25 20:40:29 2016 +0100

    Relax version of required python-mako
---
 CMakeLists.txt                                     | 60 ++++++++++++++--------
 README.md                                          |  2 +
 .../volk_gnsssdr/CMakeLists.txt                    |  2 +-
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b559d7..c63b7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,30 +436,46 @@ endif()
 # volk_gnsssdr module - GNSS-SDR's own VOLK library
 ################################################################################
 find_package(VolkGnssSdr)
-if(ENABLE_PACKAGING)
-    if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-        set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON")
-    endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
-endif(ENABLE_PACKAGING)
-set(VOLK_GNSSSDR_BUILD_COMMAND "make")
-if(PYTHON_EXECUTABLE)
-     set(USE_THIS_PYTHON "-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}")
-endif(PYTHON_EXECUTABLE)
-if(OS_IS_MACOSX)
-     if(NOT PYTHON_EXECUTABLE)
-         find_file(MAC_PYTHON python
-                   PATHS /opt/local/bin
-                         /usr/local/bin )
-         if(MAC_PYTHON)
-              set(USE_THIS_PYTHON "-DPYTHON_EXECUTABLE=${MAC_PYTHON}")
-         endif(MAC_PYTHON)
-     endif(NOT PYTHON_EXECUTABLE)
-    if(CMAKE_GENERATOR STREQUAL Xcode)
-        set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
-    endif(CMAKE_GENERATOR STREQUAL Xcode)
-endif(OS_IS_MACOSX)
+
 if(NOT VOLK_GNSSSDR_FOUND)
     message(STATUS " volk_gnsssdr will be built along with gnss-sdr when doing 'make'")
+    ###############################
+    # Find Python required modules
+    ###############################
+    include(SetupPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B
+    GNSSSDR_PYTHON_CHECK_MODULE("python >= 2.7" sys "sys.version.split()[0] >= '2.7'" PYTHON_MIN_VER_FOUND)
+    GNSSSDR_PYTHON_CHECK_MODULE("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
+    GNSSSDR_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
+
+    if(NOT PYTHON_MIN_VER_FOUND)
+        message(FATAL_ERROR "Python 2.7 or greater required to build VOLK_GNSSSDR")
+    endif()
+
+    #  Mako
+    if(NOT MAKO_FOUND)
+        message(FATAL_ERROR "Mako templates required to build VOLK_GNSSSDR")
+    endif(NOT MAKO_FOUND)
+    # Six
+    if(NOT SIX_FOUND)
+        message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
+    endif(NOT SIX_FOUND)
+    
+    if(ENABLE_PACKAGING)
+        if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+            set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON")
+        endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+    endif(ENABLE_PACKAGING)
+    
+    set(VOLK_GNSSSDR_BUILD_COMMAND "make")
+    if(PYTHON_EXECUTABLE)
+        set(USE_THIS_PYTHON "-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}")
+    endif(PYTHON_EXECUTABLE)
+    if(OS_IS_MACOSX)
+        if(CMAKE_GENERATOR STREQUAL Xcode)
+            set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
+        endif(CMAKE_GENERATOR STREQUAL Xcode)
+    endif(OS_IS_MACOSX)
+    
     set(CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     set(C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
     if(CMAKE_CROSSCOMPILING)  
diff --git a/README.md b/README.md
index 26a7b13..2441054 100644
--- a/README.md
+++ b/README.md
@@ -442,6 +442,8 @@ $ sudo port install gnuradio
 $ sudo port install armadillo
 $ sudo port install gnutls
 $ sudo port install google-glog +gflags
+$ sudo port install py27-mako
+$ sudo port install py27-six
 ~~~~~~
 
 You also might need to activate a Python installation. The list of installed versions can be retrieved with:
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 1f69938..a60c209 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -75,7 +75,7 @@ SET(CROSSCOMPILE_MULTILIB ${CROSSCOMPILE_MULTILIB} CACHE STRING "Define \"true\"
 # Python
 include(VolkPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B
 VOLK_PYTHON_CHECK_MODULE("python >= 2.7" sys "sys.version.split()[0] >= '2.7'" PYTHON_MIN_VER_FOUND)
-VOLK_PYTHON_CHECK_MODULE("mako >= 0.9.1" mako "mako.__version__ >= '0.9.1'" MAKO_FOUND)
+VOLK_PYTHON_CHECK_MODULE("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
 VOLK_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git