Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep: Use the anonymous namespace free definition of boost::none.

Browse Source 
* Fixes MSVC linking errors after the recent changes:

    "class boost::none_t const & const boost::`anonymous namespace'
    ::none" (?none@?A0x518851d0@boost@@3AEBVnone_t@2@EB)
    already defined in scripts_commands.lib...

* Sets the required version of boost on windows to 1.59
  according to the wiki.
This commit is contained in:
Naios
2017-02-27 22:31:05 +01:00
parent bb46bfb864
commit 3da60f8400
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dep/boost/CMakeLists.txt
View File

@@ -33,10 +33,17 @@ check_cxx_source_compiles("
int main() { std::wregex r(L\".*\"); }"
STD_HAS_WORKING_WREGEX)
if (STD_HAS_WORKING_WREGEX)
find_package(Boost 1.55 REQUIRED system filesystem thread program_options iostreams)
if (WIN32)
# On windows the requirements are higher according to the wiki.
set(BOOST_REQUIRED_VERSION 1.59)
else()
find_package(Boost 1.55 REQUIRED system filesystem thread program_options iostreams regex)
set(BOOST_REQUIRED_VERSION 1.55)
endif()
if (STD_HAS_WORKING_WREGEX)
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams)
else()
find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex)
endif()
# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
@@ -67,7 +74,10 @@ target_compile_definitions(boost
INTERFACE
-DBOOST_DATE_TIME_NO_LIB
-DBOOST_REGEX_NO_LIB
-DBOOST_CHRONO_NO_LIB)
-DBOOST_CHRONO_NO_LIB
# Due to MSVC linking error boost::none" already defined in scripts_...
# May be removed when the requirement is raised to boost 1.61 on windows.
-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE)
if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
target_compile_definitions(boost