From e89aef40c5e10e0f8287a127ecfbff34ad699083 Mon Sep 17 00:00:00 2001
From: Giacomo Pozzoni <giacomopoz@gmail.com>
Date: Sat, 18 Jul 2020 16:05:25 +0000
Subject: [PATCH] Dep/Boost: Set boost version to 1.67 on *nix and 1.70 on
 Windows (#25069)

# Conflicts:
#	dep/boost/CMakeLists.txt
---
 dep/boost/CMakeLists.txt | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt
index c54aecfea7c..11401b50c84 100644
--- a/dep/boost/CMakeLists.txt
+++ b/dep/boost/CMakeLists.txt
@@ -12,23 +12,9 @@ if(WIN32)
   set(BOOST_DEBUG ON)
   if(DEFINED ENV{BOOST_ROOT})
     set(BOOST_ROOT $ENV{BOOST_ROOT})
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
-      set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
-    else()
-      if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
-        set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0)
-      else()
-            if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
-              list(APPEND BOOST_LIBRARYDIR
-              ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1
-              ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0 )
-        else()
-            list(APPEND BOOST_LIBRARYDIR
-              ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2
-              ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 )
-         endif()
-      endif()
-    endif()
+    list(APPEND BOOST_LIBRARYDIR
+      ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.2
+      ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.1 )
   elseif(NOT DEFINED Boost_DIR AND NOT DEFINED BOOST_ROOT AND NOT DEFINED BOOSTROOT)
     message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
   endif()
@@ -52,9 +38,9 @@ check_cxx_source_compiles("
 
 if (WIN32)
   # On windows the requirements are higher according to the wiki.
-  set(BOOST_REQUIRED_VERSION 1.66)
+  set(BOOST_REQUIRED_VERSION 1.70)
 else()
-  set(BOOST_REQUIRED_VERSION 1.58)
+  set(BOOST_REQUIRED_VERSION 1.67)
 endif()
 
 if (STD_HAS_WORKING_WREGEX)