diff options
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/lib/keep_m_in_n_impl.cc | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/keep_m_in_n_impl.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index f2cf3440dd..db5ca6d27e 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -11,6 +11,7 @@ find_path (QWT_INCLUDE_DIRS /usr/include/qwt-qt4 /usr/include/qwt /opt/local/include/qwt + /opt/local/lib/qwt.framework/Headers /sw/include/qwt ) @@ -20,6 +21,7 @@ find_library (QWT_LIBRARIES /usr/local/lib /usr/lib /opt/local/lib + /opt/local/lib/qwt.framework /sw/lib ) diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt index e5e4243ff9..cf07cd3848 100644 --- a/gnuradio-core/src/lib/swig/CMakeLists.txt +++ b/gnuradio-core/src/lib/swig/CMakeLists.txt @@ -26,7 +26,6 @@ link_directories(${Boost_LIBRARY_DIRS}) set(GR_SWIG_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - ${GSL_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/gr-blocks/lib/keep_m_in_n_impl.cc b/gr-blocks/lib/keep_m_in_n_impl.cc index b3efdd9624..312b09c253 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.cc +++ b/gr-blocks/lib/keep_m_in_n_impl.cc @@ -39,10 +39,10 @@ namespace gr { : gr_block("keep_m_in_n", gr_make_io_signature (1, 1, itemsize), gr_make_io_signature (1, 1, itemsize)), - d_itemsize(itemsize), d_m(m), d_n(n), - d_offset(offset) + d_offset(offset), + d_itemsize(itemsize) { // sanity checking assert(d_m > 0); diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index 5e264dba0a..0b8819489a 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -30,8 +30,8 @@ namespace gr { class BLOCKS_API keep_m_in_n_impl : public keep_m_in_n { - int d_n; int d_m; + int d_n; int d_count; int d_offset; int d_itemsize; |