Merge branch 'master' of github.com:bistromath/gr-air-modes

cmake/Modules/FindQwt.cmake

@@ -4,23 +4,34 @@
 # QWT_FOUND If false, do not try to use Qwt
 
 find_path (QWT_INCLUDE_DIRS
-	NAMES qwt_plot.h
-	PATHS
-	/usr/local/include/qwt-qt4
-	/usr/local/include/qwt
-	/usr/include/qwt-qt4
-	/usr/include/qwt
-	/opt/local/include/qwt
-	/sw/include/qwt
+    NAMES qwt_plot.h
+    HINTS
+    ${CMAKE_INSTALL_PREFIX}/include/qwt
+    ${CMAKE_PREFIX_PATH}/include/qwt
+    PATHS
+    /usr/local/include/qwt-qt4
+    /usr/local/include/qwt
+    /usr/include/qwt6
+    /usr/include/qwt-qt4
+    /usr/include/qwt
+    /usr/include/qwt5
+    /opt/local/include/qwt
+    /sw/include/qwt
+    /usr/local/lib/qwt.framework/Headers
 )
 
 find_library (QWT_LIBRARIES
-	NAMES qwt-qt4 qwt
-	PATHS
-	/usr/local/lib
-	/usr/lib
-	/opt/local/lib
-	/sw/lib
+    NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5
+    HINTS
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib64
+    ${CMAKE_PREFIX_PATH}/lib 
+    PATHS
+    /usr/local/lib
+    /usr/lib
+    /opt/local/lib
+    /sw/lib
+    /usr/local/lib/qwt.framework
 )
 
 # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if

cmake/Modules/GrBoost.cmake

@@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS
   )
 
 foreach(ver ${Boost_NOGO_VERSIONS})
-  if(${Boost_VERSION} EQUAL ${ver})
+  if("${Boost_VERSION}" STREQUAL "${ver}")
     if(NOT ENABLE_BAD_BOOST)
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
       set(Boost_FOUND FALSE)
@@ -95,5 +95,5 @@ foreach(ver ${Boost_NOGO_VERSIONS})
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
       set(Boost_FOUND TRUE)
     endif(NOT ENABLE_BAD_BOOST)
-  endif(${Boost_VERSION} EQUAL ${ver})
+  endif("${Boost_VERSION}" STREQUAL "${ver}")
 endforeach(ver)

lib/preamble_impl.cc

@@ -121,7 +121,7 @@ static pmt::pmt_t tag_to_timestamp(gr::tag_t tstamp, uint64_t abs_sample_cnt, in
     //   int((abs_sample_cnt - tstamp.offset)/sps) is the integer offset
     //   (abs_sample_cnt - tstamp.offset)/sps is the fractional offset
 
-    uint64_t int_offset = int(abs_sample_cnt - tstamp.offset)/rate;
+    uint64_t int_offset = (abs_sample_cnt - tstamp.offset)/rate;
     double frac_offset = ((abs_sample_cnt - tstamp.offset) % rate) / double(rate);
 
     uint64_t abs_whole = last_whole_stamp + int_offset;

python/rx_path.py

@@ -83,6 +83,6 @@ class rx_path(gr.hier_block2):
     def get_pmf(self, pmf):
         return not (self._bb == self._demod)
 
-    def get_threshold(self, threshold):
+    def get_threshold(self):
         return self._sync.get_threshold()