[Commit-gnuradio] [gnuradio] 01/04: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit c4a4ffc44cd0991bbbbebf1e600271d922c8ccaf
Merge: 01a3260 07e6734
Author: Tom Rondeau <address@hidden>
Date:   Thu May 1 18:32:51 2014 -0400

    Merge branch 'maint'

 cmake/Modules/FindQwt.cmake                    |  2 +
 gr-filter/include/gnuradio/filter/fft_filter.h | 98 ++++++++++++++++++++++++--
 2 files changed, 93 insertions(+), 7 deletions(-)

diff --cc cmake/Modules/FindQwt.cmake
index 1a246c8,b23ecdf..1e82cb9
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@@ -37,9 -37,11 +37,11 @@@ set(QWT_FOUND FALSE
  if(QWT_INCLUDE_DIRS)
    file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
      QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
+   set(QWT_WRONG_VERSION True)
+   set(QWT_VERSION "No Version")
    string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
    string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
 -  string(COMPARE GREATER ${QWT_VERSION} "6.1.2" QWT_WRONG_VERSION)
 +  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
  
    message(STATUS "QWT Version: ${QWT_VERSION}")
    if(NOT QWT_WRONG_VERSION)