Buildsystem: Add helperscripts to detect SSE2 extensions, and optimize platform compileflags for the architecture

+ minifix in scripts (wrong includedir)

--HG--
branch : trunk

8 files changed, 510 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3579afcb1f6..45ed673a705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,8 @@ project(TrinityCore)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0005 OLD)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
 #
 # Force out-of-source build
 #
@@ -40,21 +42,36 @@ endif()
 # Basic packagesearching and setup (further support will be needed, this is a preliminary release!)
 #
 
+include(MacroEnsureVersion)
+include(OptimizeForArchitecture)
+include(AddCompilerFlag)
+include(CheckCXXSourceRuns)
+
 include(CheckIncludeFiles)
-include(cmake/FindPlatform.cmake)
-include(cmake/FindPCHSupport.cmake)
+include(FindPlatform)
+
 if(WIN32)
   set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite)
 endif()
-include(cmake/FindACE.cmake)
-include(cmake/FindMySQL.cmake)
-include(cmake/FindOpenSSL.cmake)
+
+find_package(PCHSupport)
+find_package(ACE REQUIRED)
+find_package(MySQL REQUIRED)
+find_package(OpenSSL REQUIRED)
 if( UNIX )
-  include(cmake/FindReadline.cmake)
-  include(FindZLIB)
-  include(FindBZip2)
+  find_package(Readline)
+  find_package(ZLIB)
+  find_package(BZip2)
 endif()
 
+include(cmake/SSETests.cmake)
+
+#
+# Optimize for architecture
+#
+
+OptimizeForArchitecture()
+
 #
 # Select the Release build configuration by default.
 #
@@ -290,6 +307,7 @@ if( MSVC )
   endif()
   # Multithreaded compiling on VS
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 #
diff --git a/cmake/AddCompilerFlag.cmake b/cmake/AddCompilerFlag.cmake
new file mode 100644
index 00000000000..5310b5982bc
--- /dev/null
+++ b/cmake/AddCompilerFlag.cmake
@@ -0,0 +1,12 @@
+include (CheckCXXCompilerFlag)
+macro(AddCompilerFlag _flag)
+   string(REGEX REPLACE "[/:= ]" "_" _flag_esc "${_flag}")
+   check_cxx_compiler_flag("${_flag}" check_compiler_flag_${_flag_esc})
+   if(check_compiler_flag_${_flag_esc})
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flag}")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}")
+   endif(check_compiler_flag_${_flag_esc})
+   if(${ARGC} EQUAL 2)
+      set(${ARGV1} "${check_compiler_flag_${_flag_esc}}")
+   endif(${ARGC} EQUAL 2)
+endmacro(AddCompilerFlag)
diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake
new file mode 100644
index 00000000000..6ece8768968
--- /dev/null
+++ b/cmake/FindSSE.cmake
@@ -0,0 +1,104 @@
+# Check if SSE instructions are available on the machine where 
+# the project is compiled.
+
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+   EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
+
+   STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE)
+   IF (SSE2_TRUE)
+      set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
+   ELSE (SSE2_TRUE)
+      set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
+   ENDIF (SSE2_TRUE)
+
+   # /proc/cpuinfo apparently omits sse3 :(
+   STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE)
+   IF (NOT SSE3_TRUE)
+      STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO})
+      STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE)
+   ENDIF (NOT SSE3_TRUE)
+
+   STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE)
+   IF (SSE3_TRUE OR SSSE3_TRUE)
+      set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
+   ELSE (SSE3_TRUE OR SSSE3_TRUE)
+      set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
+   ENDIF (SSE3_TRUE OR SSSE3_TRUE)
+   IF (SSSE3_TRUE)
+      set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
+   ELSE (SSSE3_TRUE)
+      set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
+   ENDIF (SSSE3_TRUE)
+
+   STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE)
+   IF (SSE41_TRUE)
+      set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
+   ELSE (SSE41_TRUE)
+      set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
+   ENDIF (SSE41_TRUE)
+ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
+      CPUINFO)
+
+   STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE)
+   IF (SSE2_TRUE)
+      set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
+   ELSE (SSE2_TRUE)
+      set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
+   ENDIF (SSE2_TRUE)
+
+   STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE)
+   IF (SSE3_TRUE)
+      set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
+   ELSE (SSE3_TRUE)
+      set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
+   ENDIF (SSE3_TRUE)
+
+   STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE)
+   IF (SSSE3_TRUE)
+      set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
+   ELSE (SSSE3_TRUE)
+      set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
+   ENDIF (SSSE3_TRUE)
+
+   STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO})
+   STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE)
+   IF (SSE41_TRUE)
+      set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
+   ELSE (SSE41_TRUE)
+      set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
+   ENDIF (SSE41_TRUE)
+ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+   # TODO
+   set(SSE2_FOUND   true  CACHE BOOL "SSE2 available on host")
+   set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
+   set(SSSE3_FOUND  false CACHE BOOL "SSSE3 available on host")
+   set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
+ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
+   set(SSE2_FOUND   true  CACHE BOOL "SSE2 available on host")
+   set(SSE3_FOUND   false CACHE BOOL "SSE3 available on host")
+   set(SSSE3_FOUND  false CACHE BOOL "SSSE3 available on host")
+   set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+if(NOT SSE2_FOUND)
+      MESSAGE(STATUS "Could not find hardware support for SSE2 on this machine.")
+endif(NOT SSE2_FOUND)
+if(NOT SSE3_FOUND)
+      MESSAGE(STATUS "Could not find hardware support for SSE3 on this machine.")
+endif(NOT SSE3_FOUND)
+if(NOT SSSE3_FOUND)
+      MESSAGE(STATUS "Could not find hardware support for SSSE3 on this machine.")
+endif(NOT SSSE3_FOUND)
+if(NOT SSE4_1_FOUND)
+      MESSAGE(STATUS "Could not find hardware support for SSE4.1 on this machine.")
+endif(NOT SSE4_1_FOUND)
+
+mark_as_advanced(SSE2_FOUND SSE3_FOUND SSSE3_FOUND SSE4_1_FOUND)
diff --git a/cmake/MacroEnsureVersion.cmake b/cmake/MacroEnsureVersion.cmake
new file mode 100644
index 00000000000..6797e5b7dbb
--- /dev/null
+++ b/cmake/MacroEnsureVersion.cmake
@@ -0,0 +1,117 @@
+# This file defines the following macros for developers to use in ensuring
+# that installed software is of the right version:
+#
+# MACRO_ENSURE_VERSION        - test that a version number is greater than
+#                               or equal to some minimum
+# MACRO_ENSURE_VERSION_RANGE - test that a version number is greater than
+#                               or equal to some minimum and less than some
+#                               maximum
+# MACRO_ENSURE_VERSION2       - deprecated, do not use in new code
+#
+
+# MACRO_ENSURE_VERSION
+# This macro compares version numbers of the form "x.y.z" or "x.y"
+# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK)
+# will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION
+# Leading and trailing text is ok, e.g.
+# MACRO_ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK)
+# which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system
+
+# Copyright (c) 2006, David Faure, <faure@kde.org>
+# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# MACRO_ENSURE_VERSION_RANGE
+# This macro ensures that a version number of the form
+# "x.y.z" or "x.y" falls within a range defined by
+# min_version <= found_version < max_version.
+# If this expression holds, FOO_VERSION_OK will be set TRUE
+#
+# Example: MACRO_ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK )
+#
+# This macro will break silently if any of x,y,z are greater than 100.
+#
+# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# NORMALIZE_VERSION
+# Helper macro to convert version numbers of the form "x.y.z"
+# to an integer equal to 10^4 * x + 10^2 * y + z
+#
+# This macro will break silently if any of x,y,z are greater than 100.
+#
+# Copyright (c) 2006, David Faure, <faure@kde.org>
+# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# CHECK_RANGE_INCLUSIVE_LOWER
+# Helper macro to check whether x <= y < z
+#
+# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+MACRO(NORMALIZE_VERSION _requested_version _normalized_version)
+    STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}")
+    if (_threePartMatch)
+    # parse the parts of the version string
+        STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}")
+        STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}")
+        STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}")
+    else (_threePartMatch)
+        STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}")
+        STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}")
+        set(_patch_vers "0")
+    endif (_threePartMatch)
+
+    # compute an overall version number which can be compared at once
+    MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}")
+ENDMACRO(NORMALIZE_VERSION)
+
+MACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok)
+   if (${_value} LESS ${_lower_limit})
+      set( ${_ok} FALSE )
+  elseif (${_value} EQUAL ${_lower_limit})
+      set( ${_ok} TRUE )
+  elseif (${_value} EQUAL ${_upper_limit})
+      set( ${_ok} FALSE )
+  elseif (${_value} GREATER ${_upper_limit})
+      set( ${_ok} FALSE )
+  else (${_value} LESS ${_lower_limit})
+      set( ${_ok} TRUE )
+  endif (${_value} LESS ${_lower_limit})
+ENDMACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER)
+
+MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old)
+    NORMALIZE_VERSION( ${requested_version} req_vers_num )
+    NORMALIZE_VERSION( ${found_version} found_vers_num )
+
+    if (found_vers_num LESS req_vers_num)
+        set( ${var_too_old} FALSE )
+    else (found_vers_num LESS req_vers_num)
+        set( ${var_too_old} TRUE )
+    endif (found_vers_num LESS req_vers_num)
+
+ENDMACRO(MACRO_ENSURE_VERSION)
+
+MACRO(MACRO_ENSURE_VERSION2 requested_version2 found_version2 var_too_old2)
+    MACRO_ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2})
+ENDMACRO(MACRO_ENSURE_VERSION2)
+
+MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok)
+    NORMALIZE_VERSION( ${min_version} req_vers_num )
+    NORMALIZE_VERSION( ${found_version} found_vers_num )
+    NORMALIZE_VERSION( ${max_version} max_vers_num )
+
+    MACRO_CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok})
+ENDMACRO(MACRO_ENSURE_VERSION_RANGE)
+
+
diff --git a/cmake/OptimizeForArchitecture.cmake b/cmake/OptimizeForArchitecture.cmake
new file mode 100644
index 00000000000..ad537275e03
--- /dev/null
+++ b/cmake/OptimizeForArchitecture.cmake
@@ -0,0 +1,216 @@
+include (AddCompilerFlag)
+include (MacroEnsureVersion)
+
+macro(_my_find _list _value _ret)
+   list(FIND ${_list} "${_value}" _found)
+   if(_found EQUAL -1)
+      set(${_ret} FALSE)
+   else(_found EQUAL -1)
+      set(${_ret} TRUE)
+   endif(_found EQUAL -1)
+endmacro(_my_find)
+
+macro(OptimizeForArchitecture)
+   set(TARGET_ARCHITECTURE "auto" CACHE STRING "CPU architecture to optimize for. Using an incorrect setting here can result in crashes of the resulting binary because of invalid instructions used.\nSetting the value to \"auto\" will try to optimize for the architecture where cmake is called.\nOther supported values are: \"core\", \"merom\" (65nm Core2), \"penryn\" (45nm Core2), \"nehalem\", \"westmere\", \"sandy-bridge\", \"atom\", \"k8\", \"k8-sse3\", \"barcelona\", \"istanbul\", \"magny-cours\".")
+   string(TOLOWER "${TARGET_ARCHITECTURE}" TARGET_ARCHITECTURE)
+
+   set(_march_flag_list)
+   set(_available_vector_units_list)
+
+   if(TARGET_ARCHITECTURE STREQUAL "auto")
+      set(TARGET_ARCHITECTURE "generic")
+      set(_vendor_id)
+      set(_cpu_family)
+      set(_cpu_model)
+      if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+         file(READ "/proc/cpuinfo" _cpuinfo)
+         string(REGEX REPLACE ".*vendor_id[ \t]*:[ \t]+([a-zA-Z0-9_-]+).*" "\\1" _vendor_id "${_cpuinfo}")
+         string(REGEX REPLACE ".*cpu family[ \t]*:[ \t]+([a-zA-Z0-9_-]+).*" "\\1" _cpu_family "${_cpuinfo}")
+         string(REGEX REPLACE ".*model[ \t]*:[ \t]+([a-zA-Z0-9_-]+).*" "\\1" _cpu_model "${_cpuinfo}")
+      elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+         exec_program("/usr/sbin/sysctl -n machdep.cpu.vendor" OUTPUT_VARIABLE _vendor_id)
+         exec_program("/usr/sbin/sysctl -n machdep.cpu.model"  OUTPUT_VARIABLE _cpu_model)
+         exec_program("/usr/sbin/sysctl -n machdep.cpu.family" OUTPUT_VARIABLE _cpu_family)
+      elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+         get_filename_component(_vendor_id "[HKEY_LOCAL_MACHINE\\Hardware\\Description\\System\\CentralProcessor\\0;VendorIdentifier]" NAME CACHE)
+         get_filename_component(_cpu_id "[HKEY_LOCAL_MACHINE\\Hardware\\Description\\System\\CentralProcessor\\0;Identifier]" NAME CACHE)
+         mark_as_advanced(_vendor_id _cpu_id)
+         string(REGEX REPLACE ".* Family ([0-9]+) .*" "\\1" _cpu_family "${_cpu_id}")
+         string(REGEX REPLACE ".* Model ([0-9]+) .*" "\\1" _cpu_model "${_cpu_id}")
+      endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      if(_vendor_id STREQUAL "GenuineIntel")
+         if(_cpu_family EQUAL 6)
+            # Any recent Intel CPU except NetBurst
+            if(_cpu_model EQUAL 37)
+               set(TARGET_ARCHITECTURE "westmere")
+            elseif(_cpu_model EQUAL 29)
+               set(TARGET_ARCHITECTURE "penryn")
+            elseif(_cpu_model EQUAL 28)
+               set(TARGET_ARCHITECTURE "atom")
+            elseif(_cpu_model EQUAL 26)
+               set(TARGET_ARCHITECTURE "nehalem")
+            elseif(_cpu_model EQUAL 23)
+               set(TARGET_ARCHITECTURE "penryn")
+            elseif(_cpu_model EQUAL 15)
+               set(TARGET_ARCHITECTURE "merom")
+            elseif(_cpu_model EQUAL 14)
+               set(TARGET_ARCHITECTURE "core")
+            endif(_cpu_model EQUAL 37)
+         elseif(_cpu_family EQUAL 7) # Itanium (not supported)
+         elseif(_cpu_family EQUAL 15) # NetBurst
+            list(APPEND _available_vector_units_list "sse" "sse2")
+            if(_cpu_model GREATER 2) # Not sure whether this must be 3 or even 4 instead
+               list(APPEND _available_vector_units_list "sse" "sse2" "sse3")
+            endif(_cpu_model GREATER 2)
+         endif(_cpu_family EQUAL 6)
+      elseif(_vendor_id STREQUAL "AuthenticAMD")
+         if(_cpu_family EQUAL 16)
+            set(TARGET_ARCHITECTURE "barcelona")
+         elseif(_cpu_family EQUAL 15)
+            set(TARGET_ARCHITECTURE "k8")
+            if(_cpu_model GREATER 64) # I don't know the right number to put here. This is just a guess from the hardware I have access to
+               set(TARGET_ARCHITECTURE "k8-sse3")
+            endif(_cpu_model GREATER 64)
+         endif(_cpu_family EQUAL 16)
+      endif(_vendor_id STREQUAL "GenuineIntel")
+   endif(TARGET_ARCHITECTURE STREQUAL "auto")
+
+   if(TARGET_ARCHITECTURE STREQUAL "core")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3")
+   elseif(TARGET_ARCHITECTURE STREQUAL "merom")
+      list(APPEND _march_flag_list "merom")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3")
+   elseif(TARGET_ARCHITECTURE STREQUAL "penryn")
+      list(APPEND _march_flag_list "penryn")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3" "sse4.1")
+   elseif(TARGET_ARCHITECTURE STREQUAL "nehalem")
+      list(APPEND _march_flag_list "nehalem")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3" "sse4.1" "sse4.2")
+   elseif(TARGET_ARCHITECTURE STREQUAL "westmere")
+      list(APPEND _march_flag_list "westmere")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3" "sse4.1" "sse4.2")
+   elseif(TARGET_ARCHITECTURE STREQUAL "sandy-bridge")
+      list(APPEND _march_flag_list "sandybridge")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3" "sse4.1" "sse4.2" "avx")
+   elseif(TARGET_ARCHITECTURE STREQUAL "atom")
+      list(APPEND _march_flag_list "atom")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "ssse3")
+   elseif(TARGET_ARCHITECTURE STREQUAL "k8")
+      list(APPEND _march_flag_list "k8")
+      list(APPEND _available_vector_units_list "sse" "sse2")
+   elseif(TARGET_ARCHITECTURE STREQUAL "k8-sse3")
+      list(APPEND _march_flag_list "k8-sse3")
+      list(APPEND _march_flag_list "k8")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3")
+   elseif(TARGET_ARCHITECTURE STREQUAL "barcelona")
+      list(APPEND _march_flag_list "barcelona")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "sse4a")
+   elseif(TARGET_ARCHITECTURE STREQUAL "istanbul")
+      list(APPEND _march_flag_list "istanbul")
+      list(APPEND _march_flag_list "barcelona")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "sse4a")
+   elseif(TARGET_ARCHITECTURE STREQUAL "magny-cours")
+      list(APPEND _march_flag_list "magnycours")
+      list(APPEND _march_flag_list "istanbul")
+      list(APPEND _march_flag_list "barcelona")
+      list(APPEND _march_flag_list "core2")
+      list(APPEND _available_vector_units_list "sse" "sse2" "sse3" "sse4a")
+   elseif(TARGET_ARCHITECTURE STREQUAL "generic")
+      list(APPEND _march_flag_list "generic")
+   else(TARGET_ARCHITECTURE STREQUAL "core")
+      message(FATAL_ERROR "Unknown target architecture: \"${TARGET_ARCHITECTURE}\". Please set TARGET_ARCHITECTURE to a supported value.")
+   endif(TARGET_ARCHITECTURE STREQUAL "core")
+
+   set(_disable_vector_unit_list)
+   set(_enable_vector_unit_list)
+   _my_find(_available_vector_units_list "sse2" SSE2_FOUND)
+   set(USE_SSE2   ${SSE2_FOUND}   CACHE BOOL "Use SSE2. If SSE2 instructions are not enabled the SSE implementation will be disabled.")
+   if(USE_SSE2)
+      list(APPEND _enable_vector_unit_list "sse2")
+      _my_find(_available_vector_units_list "sse3" SSE3_FOUND)
+      set(USE_SSE3   ${SSE3_FOUND}   CACHE BOOL "Use SSE3. If SSE3 instructions are not enabled they will be emulated.")
+      if(USE_SSE3)
+         list(APPEND _enable_vector_unit_list "sse3")
+         _my_find(_available_vector_units_list "ssse3" SSSE3_FOUND)
+         _my_find(_available_vector_units_list "sse4a" SSE4a_FOUND)
+         set(USE_SSSE3  ${SSSE3_FOUND}  CACHE BOOL "Use SSSE3. If SSSE3 instructions are not enabled they will be emulated.")
+         set(USE_SSE4a  ${SSE4a_FOUND}  CACHE BOOL "Use SSE4a. If SSE4a instructions are not enabled they will be emulated.")
+         if(USE_SSSE3)
+            list(APPEND _enable_vector_unit_list "ssse3")
+            _my_find(_available_vector_units_list "sse4.1" SSE4_1_FOUND)
+            set(USE_SSE4_1 ${SSE4_1_FOUND} CACHE BOOL "Use SSE4.1. If SSE4.1 instructions are not enabled they will be emulated.")
+            if(USE_SSE4_1)
+               list(APPEND _enable_vector_unit_list "sse4.1")
+               _my_find(_available_vector_units_list "sse4.2" SSE4_2_FOUND)
+               set(USE_SSE4_2 ${SSE4_2_FOUND} CACHE BOOL "Use SSE4.2. If SSE4.2 instructions are not enabled they will be emulated.")
+               if(USE_SSE4_2)
+                  list(APPEND _enable_vector_unit_list "sse4.2")
+               else(USE_SSE4_2)
+                  list(APPEND _disable_vector_unit_list "sse4.2")
+               endif(USE_SSE4_2)
+            else(USE_SSE4_1)
+               list(APPEND _disable_vector_unit_list "sse4.1" "sse4.2")
+            endif(USE_SSE4_1)
+         else(USE_SSSE3)
+            list(APPEND _disable_vector_unit_list "ssse3" "sse4.1" "sse4.2")
+         endif(USE_SSSE3)
+         if(USE_SSE4a)
+            list(APPEND _enable_vector_unit_list "sse4a")
+         else(USE_SSE4a)
+            list(APPEND _disable_vector_unit_list "sse4a")
+         endif(USE_SSE4a)
+      else(USE_SSE3)
+         list(APPEND _disable_vector_unit_list "sse3" "ssse3" "sse4.1" "sse4.2" "sse4a")
+      endif(USE_SSE3)
+   else(USE_SSE2)
+      list(APPEND _disable_vector_unit_list "sse2" "sse3" "ssse3" "sse4.1" "sse4.2" "sse4a")
+   endif(USE_SSE2)
+   if(CMAKE_C_COMPILER MATCHES "cl(.exe)?$") # MSVC
+      # MSVC on 32 bit can select only /arch:SSE2
+      # MSVC on 64 bit cannot select anything
+      if(NOT CMAKE_CL_64)
+         _my_find(_enable_vector_unit_list "sse2")
+         AddCompilerFlag("/arch:SSE2")
+      endif(NOT CMAKE_CL_64)
+      foreach(_flag ${_enable_vector_unit_list})
+         string(TOUPPER "${_flag}" _flag)
+         string(REPLACE "." "_" _flag "__${_flag}__")
+         add_definitions("-D${_flag}")
+      endforeach(_flag)
+   else(CMAKE_C_COMPILER MATCHES "cl(.exe)?$")
+      foreach(_flag ${_march_flag_list})
+         AddCompilerFlag("-march=${_flag}" _good)
+         if(_good)
+            break()
+         endif(_good)
+      endforeach(_flag)
+      foreach(_flag ${_enable_vector_unit_list})
+         AddCompilerFlag("-m${_flag}")
+      endforeach(_flag)
+      foreach(_flag ${_disable_vector_unit_list})
+         AddCompilerFlag("-mno-${_flag}")
+      endforeach(_flag)
+      # Not really target architecture specific, but GCC 4.5.[01] fail at inlining some functions,
+      # creating functions with a single instructions, thus a large overhead. This is a good
+      # (because central) place to fix the problem
+      if(CMAKE_COMPILER_IS_GNUCXX)
+         exec_program(${CMAKE_C_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE _gcc_version)
+         macro_ensure_version("4.5.0" "${_gcc_version}" GCC_4_5_0)
+         if(GCC_4_5_0)
+            macro_ensure_version("4.5.2" "${_gcc_version}" GCC_4_5_2)
+            if(NOT GCC_4_5_2)
+               AddCompilerFlag("--param early-inlining-insns=12")
+            endif(NOT GCC_4_5_2)
+         endif(GCC_4_5_0)
+      endif(CMAKE_COMPILER_IS_GNUCXX)
+   endif(CMAKE_C_COMPILER MATCHES "cl(.exe)?$")
+endmacro(OptimizeForArchitecture)
diff --git a/cmake/SSETests.cmake b/cmake/SSETests.cmake
new file mode 100644
index 00000000000..dddb565d6c0
--- /dev/null
+++ b/cmake/SSETests.cmake
@@ -0,0 +1,33 @@
+if(CMAKE_COMPILER_IS_GNUCXX)
+   # check the GCC version
+   exec_program(${CMAKE_C_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE _gcc_version)
+   macro_ensure_version("4.4.1" "${_gcc_version}" GCC_4_4_1)
+   if(NOT GCC_4_4_1)
+      message(STATUS "\n--\n-- WARNING : Your GCC is older than 4.4.1. This is known to cause problems/bugs.\n-- Please update to the latest GCC if you can.\n--\n--")
+      macro_ensure_version("4.3.0" "${_gcc_version}" GCC_4_3_0)
+      if(NOT GCC_4_3_0)
+         message(STATUS "\n--\n-- WARNING : Your GCC is older than 4.3.0. It is unable to handle all SSE2 intrinsics.\n-- All SSE code will be disabled. Please update to the latest GCC if you can.\n--\n--")
+         set(SSE_INTRINSICS_BROKEN true)
+      endif(NOT GCC_4_3_0)
+   endif(NOT GCC_4_4_1)
+
+   if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+      set(ENABLE_STRICT_ALIASING true CACHE BOOL "Enables strict aliasing rules for more aggressive optimizations")
+      if(NOT ENABLE_STRICT_ALIASING)
+         set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ")
+         set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-strict-aliasing ")
+         set(CMAKE_C_FLAGS_RELEASE        "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing ")
+         set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-strict-aliasing ")
+      endif(NOT ENABLE_STRICT_ALIASING)
+   endif(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+
+   # if compiling for 32 bit x86 we need to use the -mfpmath=sse since the x87 is broken by design
+   CHECK_CXX_SOURCE_RUNS("int main() { return sizeof(void*) != 8; }" VOID_PTR_IS_64BIT)
+   if(NOT VOID_PTR_IS_64BIT)
+      exec_program(${CMAKE_C_COMPILER} ARGS -dumpmachine OUTPUT_VARIABLE _gcc_machine)
+      if(_gcc_machine MATCHES "[x34567]86")
+         AddCompilerFlag("-mfpmath=sse")
+      endif(_gcc_machine MATCHES "[x34567]86")
+   endif(NOT VOID_PTR_IS_64BIT)
+endif()
+
diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h
index 9f446a71dab..cb67b1b8de6 100644
--- a/src/server/game/PrecompiledHeaders/gamePCH.h
+++ b/src/server/game/PrecompiledHeaders/gamePCH.h
@@ -5,7 +5,7 @@
 #include "Common.h"
 
 #include "MapManager.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "SQLStorage.h"
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 065bcc251e3..2d6a6c32dd3 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -52,7 +52,7 @@ message("-- Added Script Library to SCRIPTS lib")
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/mersennetwister
+  ${CMAKE_SOURCE_DIR}/dep/SFMT
   ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration