Merge TC 3.3.5

Author: Foereaper

CMakeFiles/CMakeOutput.log

@@ -0,0 +1 @@
+The system is: Windows -  - AMD64

cmake/compiler/clang/settings.cmake

@@ -3,6 +3,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
   # apple doesnt like to do the sane thing which would be to use the same version numbering as regular clang
   # version number pulled from https://en.wikipedia.org/wiki/Xcode#Toolchain_versions for row matching LLVM 11
   set(CLANG_EXPECTED_VERSION 12.0.5)
+  # enable -fpch-instantiate-templates for AppleClang (by default it is active only for regular clang)
+  set(CMAKE_C_COMPILE_OPTIONS_INSTANTIATE_TEMPLATES_PCH -fpch-instantiate-templates)
+  set(CMAKE_CXX_COMPILE_OPTIONS_INSTANTIATE_TEMPLATES_PCH -fpch-instantiate-templates)
 endif()
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS CLANG_EXPECTED_VERSION)
@@ -46,7 +49,8 @@ if(WITH_WARNINGS)
       -Winit-self
       -Wfatal-errors
       -Wno-mismatched-tags
-      -Woverloaded-virtual)
+      -Woverloaded-virtual
+      -Wno-missing-field-initializers) # this warning is useless when combined with structure members that have default initializers
 
   message(STATUS "Clang: All warnings enabled")
 endif()

cmake/compiler/msvc/settings.cmake

@@ -28,17 +28,7 @@ target_compile_options(trinity-compile-option-interface
   INTERFACE
     /permissive-)
 
-if(PLATFORM EQUAL 64)
-  # This definition is necessary to work around a bug with Intellisense described
-  # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
-  # debugger functionality.
-  target_compile_definitions(trinity-compile-option-interface
-    INTERFACE
-      _WIN64)
-
-  message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter")
-
-else()
+if(PLATFORM EQUAL 32)
   # mark 32 bit executables large address aware so they can use > 2GB address space
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
   message(STATUS "MSVC: Enabled large address awareness")
@@ -75,14 +65,12 @@ if((PLATFORM EQUAL 64) OR (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.2302
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # /Zc:throwingNew.
-  # When you specify Zc:throwingNew on the command line, it instructs the compiler to assume
-  # that the program will eventually be linked with a conforming operator new implementation,
-  # and can omit all of these extra null checks from your program.
-  # http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      /Zc:throwingNew)
+      /Zc:__cplusplus   # Enable updated __cplusplus macro value
+      /Zc:preprocessor  # Enable preprocessor conformance mode
+      /Zc:templateScope # Check template parameter shadowing
+      /Zc:throwingNew)  # Assume operator new throws
 endif()
 
 # Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns
@@ -137,14 +125,15 @@ if(BUILD_SHARED_LIBS)
   message(STATUS "MSVC: Enabled shared linking")
 endif()
 
-# Move some warnings that are enabled for other compilers from level 4 to level 3
+# Move some warnings that are enabled for other compilers from level 4 to level 3 and enable some warnings which are off by default
 target_compile_options(trinity-compile-option-interface
   INTERFACE
-    /w34100  # C4100 'identifier' : unreferenced formal parameter
+    /w15038  # C5038: data member 'member1' will be initialized after data member 'member2'
+    /w34100  # C4100: 'identifier' : unreferenced formal parameter
     /w34101  # C4101: 'identifier' : unreferenced local variable
     /w34189  # C4189: 'identifier' : local variable is initialized but not referenced
     /w34389  # C4389: 'equality-operator' : signed/unsigned mismatch
-	/w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'
+    /w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'
 
 # Enable and treat as errors the following warnings to easily detect virtual function signature failures:
 # 'function' : member function does not override any base class virtual member function

cmake/genrev.cmake

@@ -12,7 +12,7 @@
 # This is done EACH compile so they can be alerted about the consequences.
 
 if(NOT BUILDDIR)
-  # Workaround for funny MSVC behaviour - this segment is only used when using cmake gui
+  # Workaround for cmake script mode
   set(BUILDDIR ${CMAKE_BINARY_DIR})
 endif()
 
@@ -122,12 +122,29 @@ set(rev_month ${CMAKE_MATCH_2})
 set(rev_day ${CMAKE_MATCH_3})
 
 # Create the actual revision_data.h file from the above params
-if(NOT "${rev_hash_cached}" STREQUAL "${rev_hash}" OR NOT "${rev_branch_cached}" STREQUAL "${rev_branch}" OR NOT EXISTS "${BUILDDIR}/revision_data.h")
-  configure_file(
-    "${CMAKE_SOURCE_DIR}/revision_data.h.in.cmake"
-    "${BUILDDIR}/revision_data.h"
-    @ONLY
+cmake_host_system_information(RESULT TRINITY_BUILD_HOST_SYSTEM QUERY OS_NAME)
+cmake_host_system_information(RESULT TRINITY_BUILD_HOST_DISTRO QUERY DISTRIB_INFO)
+cmake_host_system_information(RESULT TRINITY_BUILD_HOST_SYSTEM_RELEASE QUERY OS_RELEASE)
+# on windows OS_RELEASE contains sub-type string tag like "Professional" instead of a version number and OS_VERSION has only build number
+# so we grab that with Get-CimInstance powershell cmdlet
+if(WIN32)
+  execute_process(
+    COMMAND powershell -NoProfile -Command "$v=(Get-CimInstance -ClassName Win32_OperatingSystem); '{0} ({1})' -f $v.Caption, $v.Version"
+    OUTPUT_VARIABLE TRINITY_BUILD_HOST_SYSTEM_RELEASE
+	OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  set(rev_hash_cached "${rev_hash}" CACHE INTERNAL "Cached commit-hash")
-  set(rev_branch_cached "${rev_branch}" CACHE INTERNAL "Cached branch name")
+  # Remove "Microsoft Windows" from the result
+  string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE ${TRINITY_BUILD_HOST_SYSTEM_RELEASE})
 endif()
+
+if(CMAKE_SCRIPT_MODE_FILE)
+  # hack for CMAKE_SYSTEM_PROCESSOR missing in script mode 
+  set(CMAKE_PLATFORM_INFO_DIR ${BUILDDIR}${CMAKE_FILES_DIRECTORY})
+  include(${CMAKE_ROOT}/Modules/CMakeDetermineSystem.cmake)
+endif()
+
+configure_file(
+  "${CMAKE_SOURCE_DIR}/revision_data.h.in.cmake"
+  "${BUILDDIR}/revision_data.h"
+  @ONLY
+)

cmake/macros/ConfigureBaseTargets.cmake

@@ -18,7 +18,8 @@ set(CMAKE_CXX_STANDARD 20)
 # Set build-directive (used in core to tell which buildtype we used)
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    _BUILD_DIRECTIVE="$<CONFIG>")
+    TRINITY_BUILD_TYPE="$<CONFIG>"
+    TRINITY_BUILD_HAS_DEBUG_INFO=$<CONFIG:Debug,RelWithDebInfo>)
 
 # An interface library to make the target features available to other targets
 add_library(trinity-feature-interface INTERFACE)

cmake/macros/FindMySQL.cmake

@@ -40,13 +40,19 @@ This module will set the following variables in your project:
   MySQL library.
 ``MYSQL_EXECUTABLE``
   Path to mysql client binary.
+``MYSQL_FLAVOR``
+  Flavor of mysql installation (MySQL or MariaDB).
+``MYSQL_VERSION``
+  MySQL version string.
 
 Hints
 ^^^^^
 
 Set ``MYSQL_ROOT_DIR`` to the root directory of MySQL installation.
 #]=======================================================================]
 
+include(FindPackageHandleStandardArgs)
+
 set(MYSQL_FOUND 0)
 
 set(_MYSQL_ROOT_HINTS
@@ -121,6 +127,7 @@ if(WIN32)
       "HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB" SUBKEYS
     VIEW BOTH
   )
+  list(FILTER _MYSQL_ROOT_HINTS_SUBKEYS INCLUDE REGEX "^MySQL Server ")
   list(SORT _MYSQL_ROOT_HINTS_SUBKEYS COMPARE NATURAL ORDER DESCENDING)
 
   set(_MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS)
@@ -136,20 +143,42 @@ if(WIN32)
     list(APPEND _MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION})
   endforeach()
 
+  cmake_host_system_information(
+    RESULT
+      _MYSQL_ROOT_HINTS_SUBKEYS
+    QUERY
+      WINDOWS_REGISTRY
+      "HKEY_LOCAL_MACHINE\\SOFTWARE" SUBKEYS
+    VIEW BOTH
+  )
+  list(FILTER _MYSQL_ROOT_HINTS_SUBKEYS INCLUDE REGEX "^MariaDB ")
+  list(SORT _MYSQL_ROOT_HINTS_SUBKEYS COMPARE NATURAL ORDER DESCENDING)
+
+  foreach(subkey IN LISTS _MYSQL_ROOT_HINTS_SUBKEYS)
+    cmake_host_system_information(
+      RESULT
+        _MYSQL_ROOT_HINTS_REGISTRY_LOCATION
+      QUERY
+        WINDOWS_REGISTRY
+        "HKEY_LOCAL_MACHINE\\SOFTWARE\\${subkey}" VALUE "INSTALLDIR"
+      VIEW BOTH
+    )
+    list(APPEND _MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION})
+  endforeach()
+
   set(_MYSQL_ROOT_HINTS
     ${_MYSQL_ROOT_HINTS}
 	${_MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]"
   )
 
   file(GLOB _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES
     LIST_DIRECTORIES TRUE
     "${PROGRAM_FILES_64}/MySQL/MySQL Server *"
     "${PROGRAM_FILES_32}/MySQL/MySQL Server *"
     "$ENV{SystemDrive}/MySQL/MySQL Server *"
+    "${PROGRAM_FILES_64}/MariaDB *"
+    "${PROGRAM_FILES_32}/MariaDB *"
+    "$ENV{SystemDrive}/MariaDB *"
   )
 
   list(SORT _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES COMPARE NATURAL ORDER DESCENDING)
@@ -219,30 +248,16 @@ endif(WIN32)
 # On Windows you typically don't need to include any extra libraries
 # to build MYSQL stuff.
 
-if(NOT WIN32)
-  find_library(MYSQL_EXTRA_LIBRARIES
-    NAMES
-      z zlib
-    PATHS
-      /usr/lib
-      /usr/local/lib
-    DOC
-      "if more libraries are necessary to link in a MySQL client (typically zlib), specify them here."
-  )
-else(NOT WIN32)
-  set(MYSQL_EXTRA_LIBRARIES "")
-endif(NOT WIN32)
-
 if(UNIX)
-    find_program(MYSQL_EXECUTABLE mysql
-    PATHS
-        ${MYSQL_CONFIG_PREFER_PATH}
-        /usr/local/mysql/bin/
-        /usr/local/bin/
-        /usr/bin/
-    DOC
-        "path to your mysql binary."
-    )
+  find_program(MYSQL_EXECUTABLE mysql
+  PATHS
+    ${MYSQL_CONFIG_PREFER_PATH}
+    /usr/local/mysql/bin/
+    /usr/local/bin/
+    /usr/bin/
+  DOC
+    "path to your mysql binary."
+  )
 endif(UNIX)
 
 if(WIN32)
@@ -291,7 +306,6 @@ foreach(_comp IN LISTS MySQL_FIND_COMPONENTS)
 endforeach()
 unset(_comp)
 
-include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MySQL
   REQUIRED_VARS
     ${MYSQL_REQUIRED_VARS}
@@ -301,25 +315,37 @@ find_package_handle_standard_args(MySQL
 )
 unset(MYSQL_REQUIRED_VARS)
 
-if(MYSQL_FOUND)
-  if(MySQL_lib_WANTED AND MySQL_lib_FOUND)
-    message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
-    message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
-  endif()
-  if(MySQL_binary_WANTED AND MySQL_binary_FOUND)
-    message(STATUS "Found MySQL executable: ${MYSQL_EXECUTABLE}")
-  endif()
-  mark_as_advanced(MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE)
-
-  if(NOT TARGET MySQL::MySQL AND MySQL_lib_WANTED AND MySQL_lib_FOUND)
-    add_library(MySQL::MySQL UNKNOWN IMPORTED)
-    set_target_properties(MySQL::MySQL
-      PROPERTIES
-        IMPORTED_LOCATION
-          "${MYSQL_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES
-          "${MYSQL_INCLUDE_DIR}")
+if(MySQL_lib_WANTED AND MySQL_lib_FOUND)
+  try_run(MYSQL_VERSION_DETECTED MYSQL_VERSION_COMPILED ${CMAKE_BINARY_DIR}
+    SOURCES "${CMAKE_CURRENT_LIST_DIR}/FindMySQLVersion.c"
+    CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${MYSQL_INCLUDE_DIR}
+    LINK_LIBRARIES ${MYSQL_LIBRARY}
+    RUN_OUTPUT_VARIABLE MYSQL_VERSION_DETECTION_RUN_OUTPUT
+  )
+
+  string(JSON MYSQL_VERSION GET "${MYSQL_VERSION_DETECTION_RUN_OUTPUT}" "version")
+  string(JSON MYSQL_FLAVOR GET "${MYSQL_VERSION_DETECTION_RUN_OUTPUT}" "flavor")
+
+  if(MYSQL_MIN_VERSION_${MYSQL_FLAVOR} VERSION_GREATER MYSQL_VERSION)
+    message(FATAL_ERROR "Found ${MYSQL_FLAVOR} version: \"${MYSQL_VERSION}\", but required is at least \"${MYSQL_MIN_VERSION_${MYSQL_FLAVOR}}\"")
+  else()
+    message(STATUS "Found ${MYSQL_FLAVOR} version: \"${MYSQL_VERSION}\", minimum required is \"${MYSQL_MIN_VERSION_${MYSQL_FLAVOR}}\"")
   endif()
-else()
-  message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers")
+
+  message(STATUS "Found ${MYSQL_FLAVOR} library: ${MYSQL_LIBRARY}")
+  message(STATUS "Found ${MYSQL_FLAVOR} headers: ${MYSQL_INCLUDE_DIR}")
+endif()
+if(MySQL_binary_WANTED AND MySQL_binary_FOUND)
+  message(STATUS "Found MySQL executable: ${MYSQL_EXECUTABLE}")
+endif()
+mark_as_advanced(MYSQL_FOUND MYSQL_LIBRARY MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE)
+
+if(NOT TARGET MySQL::MySQL AND MySQL_lib_WANTED AND MySQL_lib_FOUND)
+  add_library(MySQL::MySQL UNKNOWN IMPORTED)
+  set_target_properties(MySQL::MySQL
+    PROPERTIES
+      IMPORTED_LOCATION
+        "${MYSQL_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES
+        "${MYSQL_INCLUDE_DIR}")
 endif()

cmake/macros/FindMySQLVersion.c

@@ -0,0 +1,18 @@
+#include <mysql.h>
+#include <stdio.h>
+
+int main()
+{
+    printf("{ "
+        "\"version\": \"%d.%d.%d\", "
+        "\"flavor\": \"%s\""
+        " }",
+        MYSQL_VERSION_ID / 10000, (MYSQL_VERSION_ID / 100) % 100, MYSQL_VERSION_ID % 100,
+#ifdef MARIADB_VERSION_ID
+        "MariaDB"
+#else
+        "MySQL"
+#endif
+        );
+    return 0;
+}

cmake/options.cmake

@@ -52,6 +52,7 @@ if(WITH_FILESYSTEM_WATCHER OR BUILD_SHARED_LIBS OR ELUNA)
   set(BUILD_EFSW ON)
 endif()
 option(WITH_WARNINGS    "Show all warnings during compile"                            0)
+option(WITH_WARNINGS_AS_ERRORS "Treat warnings as errors"                             0)
 option(WITH_COREDEBUG   "Include additional debug-code in core"                       0)
 option(WITHOUT_METRICS  "Disable metrics reporting (i.e. InfluxDB and Grafana)"       0)
 option(WITH_DETAILED_METRICS  "Enable detailed metrics reporting (i.e. time each session takes to update)" 0)

src/common/WindowsSettings.manifest …ke/platform/win/WindowsSettings.manifestsrc/common/WindowsSettings.manifest renamed to cmake/platform/win/WindowsSettings.manifest src/common/WindowsSettings.manifest renamed to cmake/platform/win/WindowsSettings.manifest

@@ -8,3 +8,8 @@ target_compile_definitions(trinity-compile-option-interface
 
 # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>")
+
+# add WindowsSettings.manifest to all executables
+target_sources(trinity-core-interface
+  INTERFACE
+    $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${CMAKE_SOURCE_DIR}/cmake/platform/win/WindowsSettings.manifest>)