diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-04-25 12:15:50 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-04-25 12:15:50 -0400 |
| commit | ea27ff8ffe9cc83c1168b8e6bb2f120acd1f7577 (patch) | |
| tree | 70c8c1107ae8923c5d8e349d8fb5776770970511 | |
| parent | 566d8578955c0e94de17aea98de2f5f753d6b67d (diff) | |
| parent | 835954abadb2abb10d9d77e6b702fb9a8d18c0c3 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 2 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/max_XX.h.t | 8 | ||||
| -rw-r--r-- | volk/cmake/GrPython.cmake | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index ed7f05c4e1..395faffa5a 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -192,7 +192,7 @@ function(GR_PYTHON_INSTALL) file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native) if (CMAKE_CROSSCOMPILING) - set(pyexe_native /usr/bin/env python) + set(pyexe_native "/usr/bin/env python") endif() foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS}) diff --git a/gr-blocks/include/gnuradio/blocks/max_XX.h.t b/gr-blocks/include/gnuradio/blocks/max_XX.h.t index 44b3ad4878..258b5bf40b 100644 --- a/gr-blocks/include/gnuradio/blocks/max_XX.h.t +++ b/gr-blocks/include/gnuradio/blocks/max_XX.h.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2013 Free Software Foundation, Inc. + * Copyright 2007,2013-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -39,9 +39,8 @@ namespace gr { * \details * Data is passed in as a vector of length \p vlen from multiple * input sources. It will look through these streams of \p vlen - * data items and output two streams. - * Stream 0 will contain the index value in the vector where - * the maximum value occurred. + * data items and the output stream will contain the maximum value + * in the vector. */ class BLOCKS_API @NAME@ : virtual public sync_block { @@ -56,4 +55,3 @@ namespace gr { } /* namespace gr */ #endif /* @GUARD_NAME@ */ - diff --git a/volk/cmake/GrPython.cmake b/volk/cmake/GrPython.cmake index f2adc31a88..b7b561b7b3 100644 --- a/volk/cmake/GrPython.cmake +++ b/volk/cmake/GrPython.cmake @@ -184,7 +184,7 @@ function(VOLK_PYTHON_INSTALL) file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native) if (CMAKE_CROSSCOMPILING) - set(pyexe_native /usr/bin/env python) + set(pyexe_native "/usr/bin/env python") endif() foreach(pyfile ${VOLK_PYTHON_INSTALL_PROGRAMS}) |