From 64a1fcafb253099e60503c9738a1110b5b94fbbf Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 24 Nov 2019 21:20:37 +0100 Subject: [PATCH] Boost_ADDITIONAL_VERSIONS is deprecated --- CMakeLists.txt | 7 ++-- .../cmake/Modules/VolkBoost.cmake | 41 +++---------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 531554b52..4bbd7c505 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -663,14 +663,15 @@ endif() if(UNIX AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") # Fedora 64-bit fix endif() +# Boost_ADDITIONAL_VERSIONS is only used internally by cmake to know the +# formation of newer versions. No need to increase, not used anymore since newer +# Boost provides its own CMake configuration files. set(Boost_ADDITIONAL_VERSIONS "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" - "1.70.0" "1.70" "1.71.0" "1.71" "1.72.0" "1.72" "1.73.0" "1.73" "1.74.0" "1.74" - "1.75.0" "1.75" "1.76.0" "1.76" "1.77.0" "1.77" "1.78.0" "1.78" "1.79.0" "1.79" - "1.80.0" "1.80" "1.81.0" "1.81" "1.82.0" "1.82" "1.83.0" "1.83" "1.84.0" "1.84" + "1.70.0" "1.70" "1.71.0" "1.71" ) set(Boost_USE_MULTITHREAD ON) set(Boost_USE_STATIC_LIBS OFF) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake index 1a966bbe3..b047b3a7f 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkBoost.cmake @@ -47,48 +47,19 @@ if(MSVC) endif() endif() -find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - -# This does not allow us to disable specific versions. It is used -# internally by cmake to know the formation newer versions. As newer -# Boost version beyond what is shown here are produced, we must extend -# this list. To disable Boost versions, see below. +# This does not allow us to disable specific versions. It is used internally by +# cmake to know the formation of newer versions. No need to increase, not used +# anymore since newer Boost provides its own CMake configuration files. set(Boost_ADDITIONAL_VERSIONS - "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" - "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" - "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" - "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" + "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" - "1.70.0" "1.70" "1.71.0" "1.71" "1.72.0" "1.72" "1.73.0" "1.73" "1.74.0" "1.74" - "1.75.0" "1.75" "1.76.0" "1.76" "1.77.0" "1.77" "1.78.0" "1.78" "1.79.0" "1.79" + "1.70.0" "1.70" "1.71.0" "1.71" ) -# Boost 1.52 disabled, see https://svn.boost.org/trac/boost/ticket/7669 -# Similar problems with Boost 1.46 and 1.47. - -option(ENABLE_BAD_BOOST "Enable known bad versions of Boost" OFF) -if(ENABLE_BAD_BOOST) - message(STATUS "Enabling use of known bad versions of Boost.") -endif() - -set(Boost_NOGO_VERSIONS - "1.46.0" "1.46.1" "1.47.0" "1.52.0" -) +find_package(Boost "1.53" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) if(CMAKE_VERSION VERSION_LESS 3.14) set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") endif() - -foreach(ver ${Boost_NOGO_VERSIONS}) - if("${Boost_VERSION_STRING}" STREQUAL "${ver}") - if(NOT ENABLE_BAD_BOOST) - message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION_STRING}). Disabling.") - set(Boost_FOUND FALSE) - else() - message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION_STRING}). Continuing anyway.") - set(Boost_FOUND TRUE) - endif() - endif() -endforeach()