[Commit-gnuradio] [gnuradio] 07/07: Merge remote-tracking branch 'geiger/volkize_fft'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a03893d51553eb74ac348ee88d4dd879b0a253c8
Merge: 5a55552 b25bf5d
Author: Johnathan Corgan <address@hidden>
Date:   Sun Sep 20 21:20:57 2015 -0700

    Merge remote-tracking branch 'geiger/volkize_fft'

 gr-fft/include/gnuradio/fft/fft.h    |  16 +--
 gr-fft/include/gnuradio/fft/window.h |  14 +-
 gr-fft/lib/CMakeLists.txt            |   1 +
 gr-fft/lib/fft.cc                    | 122 ++++++++--------
 gr-fft/lib/fft_vcc_fftw.cc           | 113 ++++++++-------
 gr-fft/lib/fft_vcc_fftw.h            |   8 +-
 gr-fft/python/fft/qa_fft.py          | 262 +++++++++++++++--------------------
 7 files changed, 248 insertions(+), 288 deletions(-)

diff --cc gr-fft/lib/CMakeLists.txt
index bc2264e,bc2264e..7dd576f
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@@ -25,6 -25,6 +25,7 @@@ include_directories
      ${CMAKE_CURRENT_BINARY_DIR}
      ${GR_FFT_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
++    ${VOLK_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
      ${FFTW3F_INCLUDE_DIRS}
  )