From ca940548bfbeff585983aa537da036f75d3f0f7b Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Fri, 14 Aug 2015 18:18:30 +0200
Subject: [PATCH] Buildsystem: Fix Boost not found targeting VS2015 with
 pre-built binaries

Fix Boost libraries not being found by CMake when targeting Visual Studio 2015 with Boost installed using the binaries.
Fixes #15277
---
 cmake/macros/ConfigureBoost.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake
index 190151af155..98caa5eb227 100644
--- a/cmake/macros/ConfigureBoost.cmake
+++ b/cmake/macros/ConfigureBoost.cmake
@@ -12,7 +12,11 @@ if(WIN32)
  set(BOOST_DEBUG ON)
   if(DEFINED ENV{BOOST_ROOT})
     set(BOOST_ROOT $ENV{BOOST_ROOT})
-    set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
+      set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
+    else()
+      set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0)
+    endif()
   else()
     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()