diff options
| -rw-r--r-- | dep/boost/CMakeLists.txt | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 7c50c6e6fc2..8020908bed7 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -12,19 +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) - elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) - set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-14.0) - elseif(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() + 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() @@ -43,9 +33,9 @@ include (CheckCXXSourceCompiles) 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() find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex) |