From 6871bb1729c18d3c629b42fd2969c824f0fde316 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Thu, 20 Apr 2017 22:25:46 +0200
Subject: [PATCH] Build: Added 1.64 Boost version to FindBoost

---
 cmake/macros/FindBoost.cmake                  | 50 +++++++++++--------
 .../world/4.3.4/2017_04_20_05_world.sql       |  2 +
 src/common/CMakeLists.txt                     |  6 +--
 3 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 sql/updates/world/4.3.4/2017_04_20_05_world.sql

diff --git a/cmake/macros/FindBoost.cmake b/cmake/macros/FindBoost.cmake
index eaf5197a50..78a604bb9b 100644
--- a/cmake/macros/FindBoost.cmake
+++ b/cmake/macros/FindBoost.cmake
@@ -383,24 +383,32 @@ 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)
-    set(_boost_COMPILER "-vc110")
-  elseif (MSVC10)
-    set(_boost_COMPILER "-vc100")
-  elseif (MSVC90)
-    set(_boost_COMPILER "-vc90")
-  elseif (MSVC80)
-    set(_boost_COMPILER "-vc80")
-  elseif (MSVC71)
-    set(_boost_COMPILER "-vc71")
-  elseif (MSVC70) # Good luck!
-    set(_boost_COMPILER "-vc7") # yes, this is correct
-  elseif (MSVC60) # Good luck!
-    set(_boost_COMPILER "-vc6") # yes, this is correct
+  elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.64)
+        set(_boost_COMPILER "-vc140")
+      else()
+        set(_boost_COMPILER "-vc141")
+      endif()
+    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+      set(_boost_COMPILER "-vc140")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
+      set(_boost_COMPILER "-vc120")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17)
+      set(_boost_COMPILER "-vc110")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+      set(_boost_COMPILER "-vc100")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
+      set(_boost_COMPILER "-vc90")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
+      set(_boost_COMPILER "-vc80")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.10)
+      set(_boost_COMPILER "-vc71")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) # Good luck!
+      set(_boost_COMPILER "-vc7") # yes, this is correct
+    else() # VS 6.0 Good luck!
+      set(_boost_COMPILER "-vc6") # yes, this is correct
+    endif()
   elseif (BORLAND)
     set(_boost_COMPILER "-bcb")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
@@ -478,9 +486,9 @@ else()
   # The user has not requested an exact version.  Among known
   # versions, find those that are acceptable to the user request.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.62.0" "1.62" "1.61.0" "1.61"
-    "1.60.0" "1.60" "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56"
-    "1.55.0" "1.55" "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
+    "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
+    "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
+    "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
     "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
     "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
     "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
diff --git a/sql/updates/world/4.3.4/2017_04_20_05_world.sql b/sql/updates/world/4.3.4/2017_04_20_05_world.sql
new file mode 100644
index 0000000000..c3b1808ed2
--- /dev/null
+++ b/sql/updates/world/4.3.4/2017_04_20_05_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `command` SET `name`='reload gameobject_template_locale', `help`='Syntax: .reload gameobject_template_localeReload gameobject_template_locale table.' WHERE `name`='reload locales_gameobject';
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 82b74f13ef..626e170609 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -61,6 +61,8 @@ target_include_directories(common
     ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(common
+  PRIVATE
+    process
   PUBLIC
     boost
     fmt
@@ -71,9 +73,7 @@ target_link_libraries(common
     openssl
     valgrind
     threads
-    jemalloc
-  PRIVATE
-    process)
+    jemalloc)
 
 add_dependencies(common revision_data.h)