Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/Boost: Set boost version to 1.67 on *nix and 1.70 on Windows (#25069)

Browse Source 
# Conflicts:
#	dep/boost/CMakeLists.txt
This commit is contained in:
Giacomo Pozzoni
2020-07-18 16:05:25 +00:00
committed by Ovahlord
parent 9d5848ec6e
commit e89aef40c5
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dep/boost/CMakeLists.txt
View File

@@ -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)