[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'next' into 'next-qt5'

[git]

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

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit c034036fbb0a097b2ccbbacdfdb113f8355cdbcc
Merge: 11ce262 c5f7b07
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 14:08:07 2016 -0700

    Merge branch 'next' into 'next-qt5'

 CMakeLists.txt                                     | 15 +++--
 cmake/Modules/FindGSL.cmake                        |  2 +-
 cmake/Modules/FindQwt.cmake                        |  4 +-
 cmake/Modules/GrBoost.cmake                        |  7 ++-
 cmake/msvc/config.h                                |  7 +++
 gnuradio-runtime/include/gnuradio/attributes.h     | 11 ++++
 gnuradio-runtime/include/gnuradio/high_res_timer.h |  2 +-
 gnuradio-runtime/lib/CMakeLists.txt                |  8 +--
 gnuradio-runtime/lib/flat_flowgraph.cc             |  4 +-
 gnuradio-runtime/lib/math/random.cc                |  2 +-
 gnuradio-runtime/lib/realtime_impl.cc              | 70 +++++++++++-----------
 gnuradio-runtime/lib/thread/thread.cc              | 10 +++-
 gnuradio-runtime/lib/thread/thread_body_wrapper.cc |  2 +-
 gnuradio-runtime/lib/tpb_thread_body.cc            |  4 +-
 gr-audio/lib/portaudio/portaudio_sink.cc           |  3 +
 gr-audio/lib/portaudio/portaudio_source.cc         |  3 +
 gr-blocks/lib/ConfigChecks.cmake                   |  2 +-
 gr-blocks/lib/udp_source_impl.cc                   |  3 -
 gr-dtv/lib/CMakeLists.txt                          | 19 +++++-
 .../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc  |  5 +-
 gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc |  3 +-
 gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc  |  4 +-
 gr-dtv/lib/dvbt/dvbt_reed_solomon.cc               | 14 ++---
 gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc       | 24 ++++----
 gr-qtgui/lib/CMakeLists.txt                        |  5 ++
 gr-vocoder/lib/codec2/fdmdv.c                      |  2 +-
 gr-zeromq/lib/pull_msg_source_impl.cc              |  4 +-
 gr-zeromq/lib/req_msg_source_impl.cc               |  4 +-
 gr-zeromq/lib/sub_msg_source_impl.cc               |  4 +-
 29 files changed, 158 insertions(+), 89 deletions(-)

diff --cc cmake/Modules/FindQwt.cmake
index 95ddd44,da8bbe9..547a49f
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@@ -9,11 -9,12 +9,12 @@@ find_path(QWT_INCLUDE_DIR
    NAMES qwt_global.h
    HINTS
    ${CMAKE_INSTALL_PREFIX}/include/qwt
+   ${CMAKE_PREFIX_PATH}/include/qwt
    PATHS
 -  /usr/local/include/qwt-qt4
 +  /usr/local/include/qwt-qt5
    /usr/local/include/qwt
    /usr/include/qwt6
 -  /usr/include/qwt-qt4
 +  /usr/include/qwt-qt5
    /usr/include/qwt
    /usr/include/qwt5
    /opt/local/include/qwt
@@@ -26,6 -27,7 +27,7 @@@ find_library (QWT_LIBRARIE
    HINTS
    ${CMAKE_INSTALL_PREFIX}/lib
    ${CMAKE_INSTALL_PREFIX}/lib64
 -  ${CMAKE_PREFIX_PATH}/lib 
++  ${CMAKE_PREFIX_PATH}/lib
    PATHS
    /usr/local/lib
    /usr/lib