Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 35 insertions, 0 deletions

diff --git a/cmake/macros/ConfigureBoost.cmake b/cmake/macros/ConfigureBoost.cmake
new file mode 100644
index 00000000000..ae5ac633ce2
--- /dev/null
+++ b/cmake/macros/ConfigureBoost.cmake
@@ -0,0 +1,35 @@
+macro(get_WIN32_WINNT version)

+    if (WIN32 AND CMAKE_SYSTEM_VERSION)

+        set(ver ${CMAKE_SYSTEM_VERSION})

+        string(REPLACE "." "" ver ${ver})

+        string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})

+

+        set(${version} "0x${ver}")

+    endif()

+endmacro()

+

+if(WIN32)

+ set(BOOST_DEBUG ON)

+  if(DEFINED ENV{BOOST_ROOT})

+    set(BOOST_ROOT $ENV{BOOST_ROOT})

+    set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)

+  else()

+    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()

+

+  set(Boost_USE_STATIC_LIBS        ON)

+  set(Boost_USE_MULTITHREADED      ON)

+  set(Boost_USE_STATIC_RUNTIME     OFF)

+  

+  get_WIN32_WINNT(ver)

+  add_definitions(-D_WIN32_WINNT=${ver})

+endif()

+

+find_package(Boost 1.49 REQUIRED system thread program_options)

+add_definitions(-DBOOST_DATE_TIME_NO_LIB)

+add_definitions(-DBOOST_REGEX_NO_LIB)

+add_definitions(-DBOOST_CHRONO_NO_LIB)

+

+if(Boost_FOUND)

+  include_directories(${Boost_INCLUDE_DIRS})

+endif()