[Commit-gnuradio] [gnuradio] 14/14: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0d32337545f554dffe0dee69f5f1415ac2f5b673
Merge: 2b388ea 23460e3
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 13:54:20 2016 -0700

    Merge branch 'maint'
    
    Conflicts:
        CMakeLists.txt

 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 8b9b28f,622b724..4b4714e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -46,39 -46,15 +46,41 @@@ 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 9)
 -set(VERSION_INFO_MAINT_VERSION 2)
 +set(VERSION_INFO_MINOR_VERSION 10)
 +set(VERSION_INFO_MAINT_VERSION git)
  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:
 +# set(CMAKE_C_STANDARD 90)
 +# set(CMAKE_CXX_STANDARD 98)
 +
 +IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 +    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
 +ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 +    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
 +ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 +    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
 +ELSE()
 +    message(warning "C++ standard could not be set because compiler is not 
GNU, Clang or MSVC.")
 +ENDIF()
 +
 +IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 +    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 +ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
 +    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 +ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
 +    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
 +ELSE()
 +    message(warning "C standard could not be set because compiler is not GNU, 
Clang or MSVC.")
 +ENDIF()
 +
  ########################################################################
  # Environment setup
  ########################################################################