[Commit-gnuradio] [gnuradio] 02/03: 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 a5b63da9419ade4514d31ccaef75e53b95e9862e
Merge: 0f61e4e 2a6c82f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 10 13:25:42 2016 -0700

    Merge branch 'maint'
    
    Conflicts:
        CMakeLists.txt

 CMakeLists.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --cc CMakeLists.txt
index 4b4714e,c2529f0..ae0a8b6
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -56,31 -56,23 +56,48 @@@ IF (NOT MSVC
      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()
 +
+ # Set cmake policies.
+ # This will suppress developer warnings during the cmake process that can 
occur
+ # if a newer cmake version than the minimum is used.
+ 
+ if(POLICY CMP0026)
+     cmake_policy(SET CMP0026 OLD)
+ endif()
+ if(POLICY CMP0043)
+     cmake_policy(SET CMP0043 OLD)
+ endif()
+ if(POLICY CMP0045)
+     cmake_policy(SET CMP0045 OLD)
+ endif()
+ if(POLICY CMP0046)
+     cmake_policy(SET CMP0046 OLD)
+ endif()
+ 
  ########################################################################
  # Environment setup
  ########################################################################