[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'min_deps_master' into min_deps_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 4873481d34f39948ef956d8bb12f6de13aba5b89
Merge: 99d24d2 bcf47d4
Author: Martin Braun <address@hidden>
Date:   Sun Mar 26 18:19:48 2017 -0700

    Merge branch 'min_deps_master' into min_deps_next

 CMakeLists.txt                                     | 136 +++++++++++++++------
 cmake/Modules/GrBoost.cmake                        |   4 +-
 docs/doxygen/CMakeLists.txt                        |   4 +
 .../other/{build_guide.dox => build_guide.dox.in}  |  34 ++++--
 4 files changed, 123 insertions(+), 55 deletions(-)

diff --cc CMakeLists.txt
index 9f07e2c,4784815..774f8e6
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,7 -25,9 +25,9 @@@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CM
  ########################################################################
  # Project setup
  ########################################################################
+ # Make sure this version matches ${GR_CMAKE_MIN_VERSION} (a variable can't be
+ # used here).
 -cmake_minimum_required(VERSION 2.6)
 +cmake_minimum_required(VERSION 2.8.12)
  project(gnuradio CXX C)
  enable_testing()
  
@@@ -45,46 -47,28 +47,28 @@@ 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 12)
 -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 (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()
+ # Minimum dependency versions for central dependencies:
+ set(GR_BOOST_MIN_VERSION "1.48")
+ set(GR_SWIG_MIN_VERSION "2.0.3")
+ set(GR_CMAKE_MIN_VERSION "2.8.12")
+ set(GR_MAKO_MIN_VERSION "0.4.2")
+ set(GR_PYTHON_MIN_VERSION "2.7")
+ #set(GR_PYTHON3_MIN_VERSION "3.x") # Py3k not yet supported
+ set(GR_CPPUNIT_MIN_VERSION "1.12.1")
+ set(GCC_MIN_VERSION "4.4.0")
+ set(CLANG_MIN_VERSION "3.3.0")
+ set(APPLECLANG_MIN_VERSION "500")
  
- # 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=gnu99")
- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- 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.
+ ########################################################################
+ # Configure 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()