diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-18 16:05:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 18:05:25 +0200 |
| commit | c54dc3ef9273378c55e0c17acef18de731a7f8eb (patch) | |
| tree | 1e2482fac05b5894ae30bd85789325abcff3d256 | |
| parent | 5eb742ee6a892b684b0c4cbde9f02f838b8300e5 (diff) | |
Dep/Boost: Set boost version to 1.67 on *nix and 1.70 on Windows (#25069)
| -rw-r--r-- | dep/boost/CMakeLists.txt | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index f674ad7babe..52f9aebf285 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() @@ -47,9 +33,9 @@ include (CheckCXXSourceCompiles) if (WIN32) # On windows the requirements are higher according to the wiki. - set(BOOST_REQUIRED_VERSION 1.59) + 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) |