[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit c5f7b07aff9320e3d13bb8d26aa4dc43093e569a
Merge: 45d19af 0d32337
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 14:05:38 2016 -0700

    Merge branch 'master' into next

 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 CMakeLists.txt
index 99f1ad2,4b4714e..f122d00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -45,14 -45,16 +45,16 @@@ message(STATUS "Build type set to ${CMA
  
  # Set the version information here
  set(VERSION_INFO_MAJOR_VERSION 3)
 -set(VERSION_INFO_API_COMPAT    7)
 -set(VERSION_INFO_MINOR_VERSION 10)
 -set(VERSION_INFO_MAINT_VERSION git)
 +set(VERSION_INFO_API_COMPAT    8)
 +set(VERSION_INFO_MINOR_VERSION git)
 +set(VERSION_INFO_MAINT_VERSION 0)
  include(GrVersion) #setup version info
  
- # Append -O2 optimization flag for Debug builds
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
+ # Append -O2 optimization flag for Debug builds (Not on MSVC since conflicts 
with RTC1 flag)
+ IF (NOT MSVC)
+     SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2")
+     SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
+ ENDIF()
  
  # Set C/C++ standard for all targets
  # NOTE: Starting with cmake v3.1 this should be used: