[Commit-gnuradio] [gnuradio] 01/04: cmake: Add mako as dependency for gr

commit-gnuradio

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 01/04: cmake: Add mako as dependency for gr

From:	git
Subject:	[Commit-gnuradio] [gnuradio] 01/04: cmake: Add mako as dependency for gr-utils
Date:	Tue, 29 Dec 2015 15:49:36 +0000 (UTC)

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 9bfa5e35d27da1f2ee3935542e98f73c183bcb0d
Author: Martin Braun <address@hidden>
Date:   Mon Dec 28 11:51:11 2015 -0800

    cmake: Add mako as dependency for gr-utils
---
 cmake/Packaging/Fedora-15.cmake    |  3 ++-
 cmake/Packaging/Fedora-16.cmake    |  3 ++-
 cmake/Packaging/Fedora-17.cmake    |  1 +
 cmake/Packaging/Fedora-18.cmake    |  1 +
 cmake/Packaging/Ubuntu-10.04.cmake |  1 +
 cmake/Packaging/Ubuntu-10.10.cmake |  1 +
 cmake/Packaging/Ubuntu-11.04.cmake |  1 +
 cmake/Packaging/Ubuntu-11.10.cmake |  1 +
 cmake/Packaging/Ubuntu-12.04.cmake |  1 +
 cmake/Packaging/Ubuntu-12.10.cmake |  1 +
 cmake/Packaging/Ubuntu-13.04.cmake |  1 +
 docs/doxygen/other/build_guide.dox |  1 +
 gr-utils/CMakeLists.txt            | 10 ++++++++++
 13 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/cmake/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake
index c86dbed..4e64848 100644
--- a/cmake/Packaging/Fedora-15.cmake
+++ b/cmake/Packaging/Fedora-15.cmake
@@ -1,7 +1,8 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4")
-SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah")
+SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah" 
"python-mako")
 SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy")
 SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL")
 SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd")
diff --git a/cmake/Packaging/Fedora-16.cmake b/cmake/Packaging/Fedora-16.cmake
index c86dbed..4e64848 100644
--- a/cmake/Packaging/Fedora-16.cmake
+++ b/cmake/Packaging/Fedora-16.cmake
@@ -1,7 +1,8 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4")
-SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah")
+SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah" 
"python-mako")
 SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy")
 SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL")
 SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd")
diff --git a/cmake/Packaging/Fedora-17.cmake b/cmake/Packaging/Fedora-17.cmake
index ee54607..4e7ff51 100644
--- a/cmake/Packaging/Fedora-17.cmake
+++ b/cmake/Packaging/Fedora-17.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4")
 SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah")
diff --git a/cmake/Packaging/Fedora-18.cmake b/cmake/Packaging/Fedora-18.cmake
index ee54607..4e7ff51 100644
--- a/cmake/Packaging/Fedora-18.cmake
+++ b/cmake/Packaging/Fedora-18.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4")
 SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-10.04.cmake 
b/cmake/Packaging/Ubuntu-10.04.cmake
index c297a50..7f0fe82 100644
--- a/cmake/Packaging/Ubuntu-10.04.cmake
+++ b/cmake/Packaging/Ubuntu-10.04.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-10.10.cmake 
b/cmake/Packaging/Ubuntu-10.10.cmake
index c297a50..7f0fe82 100644
--- a/cmake/Packaging/Ubuntu-10.10.cmake
+++ b/cmake/Packaging/Ubuntu-10.10.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-11.04.cmake 
b/cmake/Packaging/Ubuntu-11.04.cmake
index d08ae1d..b72ff46 100644
--- a/cmake/Packaging/Ubuntu-11.04.cmake
+++ b/cmake/Packaging/Ubuntu-11.04.cmake
@@ -1,5 +1,6 @@
 #set the debian package dependencies (parsed by our deb component maker)
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt5-qt4")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-11.10.cmake 
b/cmake/Packaging/Ubuntu-11.10.cmake
index d27cdae..952eeb6 100644
--- a/cmake/Packaging/Ubuntu-11.10.cmake
+++ b/cmake/Packaging/Ubuntu-11.10.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-12.04.cmake 
b/cmake/Packaging/Ubuntu-12.04.cmake
index f5ead83..8d4b8d1 100644
--- a/cmake/Packaging/Ubuntu-12.04.cmake
+++ b/cmake/Packaging/Ubuntu-12.04.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-12.10.cmake 
b/cmake/Packaging/Ubuntu-12.10.cmake
index f5ead83..8d4b8d1 100644
--- a/cmake/Packaging/Ubuntu-12.10.cmake
+++ b/cmake/Packaging/Ubuntu-12.10.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6")
 SET(PACKAGE_DEPENDS_QTGUI_PYTHON "python-qt4" "python-qwt5-qt4")
 SET(PACKAGE_DEPENDS_GRC "python" "python-numpy" "python-gtk2" "python-lxml" 
"python-cheetah")
diff --git a/cmake/Packaging/Ubuntu-13.04.cmake 
b/cmake/Packaging/Ubuntu-13.04.cmake
index 40f748f..ed14b1a 100644
--- a/cmake/Packaging/Ubuntu-13.04.cmake
+++ b/cmake/Packaging/Ubuntu-13.04.cmake
@@ -1,4 +1,5 @@
 SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "libboost-all-dev" "libc6")
+SET(PACKAGE_DEPENDS_UTILS "python-mako")
 SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python" "python-numpy")
 SET(PACKAGE_DEPENDS_CORE_RUNTIME "libfftw3-3")
 SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "libqtcore4" "libqwt6")
diff --git a/docs/doxygen/other/build_guide.dox 
b/docs/doxygen/other/build_guide.dox
index 8fc3f91..87e5a45 100644
--- a/docs/doxygen/other/build_guide.dox
+++ b/docs/doxygen/other/build_guide.dox
@@ -29,6 +29,7 @@ first. Most recent systems have these packages available.
 \li boost       (>= 1.35)    http://www.boost.org/users/download/
 \li cppunit     (>= 1.9.14)  http://freedesktop.org/wiki/Software/cppunit/
 \li fftw3f      (>= 3.0.1)   http://www.fftw.org/download.html
+\li mako        (>= 0.4.2)   http://www.makotemplates.org/download.html
 
 \subsection dep_python Python Wrappers
 \li python      (>= 2.5)     http://www.python.org/download/
diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
index 7985535..b9d3763 100644
--- a/gr-utils/CMakeLists.txt
+++ b/gr-utils/CMakeLists.txt
@@ -20,14 +20,24 @@
 ########################################################################
 # Setup dependencies
 ########################################################################
+include(GrPython)
+
+GR_PYTHON_CHECK_MODULE("Mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" 
MAKO_FOUND)
 
 ########################################################################
 # Register component
 ########################################################################
 include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+    set(utils_python_deps
+        MAKO_FOUND
+    )
+endif(NOT CMAKE_CROSSCOMPILING)
+
 GR_REGISTER_COMPONENT("gr-utils" ENABLE_GR_UTILS
     ENABLE_GNURADIO_RUNTIME
     ENABLE_PYTHON
+    ${utils_python_deps}
 )
 
 ########################################################################

[Prev in Thread]

Current Thread

[Next in Thread]

[Commit-gnuradio] [gnuradio] branch next updated (3ec66e9 -> d3cbf64), git, 2015/12/29
- [Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'mbr0wn/modtool/mako' into next, git, 2015/12/29
- [Commit-gnuradio] [gnuradio] 01/04: cmake: Add mako as dependency for gr-utils, git <=
- [Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next, git, 2015/12/29
- [Commit-gnuradio] [gnuradio] 02/04: modtool: Switched over to mako template engine, git, 2015/12/29

Prev by Date: [Commit-gnuradio] [gnuradio] 03/06: Add 2X interpolation capability to DVB-S2 modulator.
Next by Date: [Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next
Previous by thread: [Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'mbr0wn/modtool/mako' into next
Next by thread: [Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next
Index(es):
- Date
- Thread