Merge branch 'TrinityCore:3.3.5' into cfpve

Author: urwifemykids

CMakeLists.txt

@@ -21,12 +21,17 @@ project(TrinityCore)
 cmake_policy(SET CMP0005 NEW)
 cmake_policy(SET CMP0043 NEW) # Ignore COMPILE_DEFINITIONS_<Config> properties
 cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted - prevents intepreting if(SOME_STRING_VARIABLE MATCHES "MSVC") as if(SOME_STRING_VARIABLE MATCHES "1")
+cmake_policy(SET CMP0067 NEW) # Honor language standard in try_compile() source-file signature
 cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT variables
 
 if(POLICY CMP0144)
   cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables
 endif()
 
+if(POLICY CMP0153)
+  cmake_policy(SET CMP0153 NEW) # The exec_program() command should not be called
+endif()
+
 # Set RPATH-handing (CMake parameters)
 set(CMAKE_SKIP_BUILD_RPATH 0)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 0)

cmake/compiler/clang/settings.cmake

@@ -1,8 +1,3 @@
-# Set build-directive (used in core to tell which buildtype we used)
-target_compile_definitions(trinity-compile-option-interface
-  INTERFACE
-    -D_BUILD_DIRECTIVE="$<CONFIG>")
-
 set(CLANG_EXPECTED_VERSION 11.0.0)
 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
@@ -38,7 +33,7 @@ if (NOT CLANG_HAVE_PROPER_CHARCONV)
   message(STATUS "Clang: Detected from_chars bug for 64-bit integers, workaround enabled")
   target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    -DTRINITY_NEED_CHARCONV_WORKAROUND)
+    TRINITY_NEED_CHARCONV_WORKAROUND)
 endif()
 
 if(WITH_WARNINGS)

cmake/compiler/gcc/settings.cmake

@@ -1,8 +1,3 @@
-# Set build-directive (used in core to tell which buildtype we used)
-target_compile_definitions(trinity-compile-option-interface
-  INTERFACE
-    -D_BUILD_DIRECTIVE="$<CONFIG>")
-
 set(GCC_EXPECTED_VERSION 11.1.0)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION)
@@ -11,6 +6,10 @@ else()
   message(STATUS "GCC: Minimum version required is ${GCC_EXPECTED_VERSION}, found ${CMAKE_CXX_COMPILER_VERSION} - ok!")
 endif()
 
+target_compile_options(trinity-compile-option-interface
+  INTERFACE
+    -fno-delete-null-pointer-checks)
+
 if(PLATFORM EQUAL 32)
   # Required on 32-bit systems to enable SSE2 (standard on x64)
   target_compile_options(trinity-compile-option-interface
@@ -21,8 +20,8 @@ endif()
 if(TRINITY_SYSTEM_PROCESSOR MATCHES "x86|amd64")
   target_compile_definitions(trinity-compile-option-interface
     INTERFACE
-      -DHAVE_SSE2
-      -D__SSE2__)
+      HAVE_SSE2
+      __SSE2__)
   message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
 endif()
 
@@ -36,7 +35,8 @@ if(WITH_WARNINGS)
       -Winvalid-pch
       -Wfatal-errors
       -Woverloaded-virtual
-      -Wno-missing-field-initializers) # this warning is useless when combined with structure members that have default initializers
+      -Wno-missing-field-initializers # this warning is useless when combined with structure members that have default initializers
+      -Wno-maybe-uninitialized)       # this warning causes many false positives with std::optional
 
   message(STATUS "GCC: All warnings enabled")
 endif()

cmake/compiler/icc/settings.cmake

@@ -1,7 +1,3 @@
-target_compile_definitions(trinity-compile-option-interface
-  INTERFACE
-    -D_BUILD_DIRECTIVE="$<CONFIG>")
-
 if(PLATFORM EQUAL 32)
   target_compile_options(trinity-compile-option-interface
     INTERFACE

cmake/compiler/mingw/settings.cmake

@@ -1,6 +1,3 @@
-# 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)
-
 set(MSVC_EXPECTED_VERSION 19.32)
 set(MSVC_EXPECTED_VERSION_STRING "Microsoft Visual Studio 2022 17.2")
 
@@ -31,17 +28,13 @@ target_compile_options(trinity-compile-option-interface
   INTERFACE
     /permissive-)
 
-# set up output paths ofr static libraries etc (commented out - shown here as an example only)
-#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
 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
-      -D_WIN64)
+      _WIN64)
 
   message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter")
 
@@ -59,24 +52,19 @@ else()
   message(STATUS "MSVC: Disabled Safe Exception Handlers for debug builds")
 endif()
 
-# Set build-directive (used in core to tell which buildtype we used)
-# msbuild/devenv don't set CMAKE_MAKE_PROGRAM, you can choose build type from a dropdown after generating projects
 if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
-  target_compile_definitions(trinity-compile-option-interface
+  # multithreaded compiling on VS
+  target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -D_BUILD_DIRECTIVE="$(ConfigurationName)")
+      /MP)
 else()
-  # while all make-like generators do (nmake, ninja)
-  target_compile_definitions(trinity-compile-option-interface
+  # Forces writes to the PDB file to be serialized through mspdbsrv.exe (/FS)
+  # Enable faster PDB generation in parallel builds by minimizing RPC calls to mspdbsrv.exe (/Zf)
+  target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -D_BUILD_DIRECTIVE="$<CONFIG>")
+      $<$<CONFIG:Debug,RelWithDebInfo>:/FS /Zf>)
 endif()
 
-# multithreaded compiling on VS
-target_compile_options(trinity-compile-option-interface
-  INTERFACE
-    /MP)
-
 if((PLATFORM EQUAL 64) OR (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.23026.0) OR BUILD_SHARED_LIBS)
   # Enable extended object support
   target_compile_options(trinity-compile-option-interface
@@ -86,36 +74,38 @@ if((PLATFORM EQUAL 64) OR (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.2302
   message(STATUS "MSVC: Enabled increased number of sections in object files")
 endif()
 
-# /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)
+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)
+endif()
 
 # Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
+    _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
 message(STATUS "MSVC: Overloaded standard names")
 
 # Ignore warnings about older, less secure functions
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    -D_CRT_SECURE_NO_WARNINGS)
+    _CRT_SECURE_NO_WARNINGS)
 message(STATUS "MSVC: Disabled NON-SECURE warnings")
 
 # Ignore warnings about POSIX deprecation
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    -D_CRT_NONSTDC_NO_WARNINGS)
+    _CRT_NONSTDC_NO_WARNINGS)
 
 # Force math constants like M_PI to be available
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
-    -D_USE_MATH_DEFINES)
+    _USE_MATH_DEFINES)
 
 message(STATUS "MSVC: Disabled POSIX warnings")
 
@@ -167,8 +157,8 @@ target_compile_options(trinity-compile-option-interface
 if(ASAN)
   target_compile_definitions(trinity-compile-option-interface
     INTERFACE
-      -D_DISABLE_STRING_ANNOTATION
-      -D_DISABLE_VECTOR_ANNOTATION)
+      _DISABLE_STRING_ANNOTATION
+      _DISABLE_VECTOR_ANNOTATION)
 
   target_compile_options(trinity-compile-option-interface
     INTERFACE

cmake/compiler/msvc/settings.cmake

@@ -35,3 +35,13 @@ if(WIN32)
 elseif(UNIX)
   include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  include("${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake")
+endif()

cmake/macros/CheckPlatform.cmake

@@ -13,14 +13,16 @@ add_library(trinity-compile-option-interface INTERFACE)
 
 # Use -std=c++11 instead of -std=gnu++11
 set(CMAKE_CXX_EXTENSIONS OFF)
+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>")
 
 # An interface library to make the target features available to other targets
 add_library(trinity-feature-interface INTERFACE)
 
-target_compile_features(trinity-feature-interface
-  INTERFACE
-    cxx_std_20)
-
 # An interface library to make the warnings level available to other targets
 # This interface taget is set-up through the platform specific script
 add_library(trinity-warning-interface INTERFACE)