diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
| commit | f767aef12eaf2e55deed89590eb9e8a39b0d1653 (patch) | |
| tree | c8737ba6d3d7065daf61046ed9d424d7bfc7c5e0 /cmake/macros/FindBoost.cmake | |
| parent | 8e288dd6731ed608d8285f9f966783ee9b46eebf (diff) | |
| parent | 72d08a146f3ca8369f173b9293d564673155491a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'cmake/macros/FindBoost.cmake')
| -rw-r--r-- | cmake/macros/FindBoost.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/macros/FindBoost.cmake b/cmake/macros/FindBoost.cmake index 90bba26db70..ebd1c29598a 100644 --- a/cmake/macros/FindBoost.cmake +++ b/cmake/macros/FindBoost.cmake @@ -349,6 +349,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) else()
set (_boost_COMPILER "-il")
endif()
+ elseif (MSVC14)
+ set(_boost_COMPILER "-vc140")
elseif (MSVC12)
set(_boost_COMPILER "-vc120")
elseif (MSVC11)
|