diff options
author | Shauren <shauren.trinity@gmail.com> | 2023-01-01 00:26:53 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2023-01-01 00:26:53 +0100 |
commit | 0a1b40241a12b2b2f4549edf0ee263e91236145b (patch) | |
tree | d075da74ba9db89cfbaa83ffef8541ebcc687adb /cmake/compiler | |
parent | ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2 (diff) |
Build: Update required compilers to current debian stable and VS 2022
GCC: 10
Clang: 11
MSVC: 2022
Diffstat (limited to 'cmake/compiler')
-rw-r--r-- | cmake/compiler/clang/settings.cmake | 2 | ||||
-rw-r--r-- | cmake/compiler/gcc/settings.cmake | 2 | ||||
-rw-r--r-- | cmake/compiler/msvc/settings.cmake | 13 |
3 files changed, 7 insertions, 10 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index 1f11cb4112e..f6e95030b57 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -5,7 +5,7 @@ target_compile_definitions(trinity-compile-option-interface INTERFACE -D_BUILD_DIRECTIVE="$<CONFIG>") -set(CLANG_EXPECTED_VERSION 7.0.0) +set(CLANG_EXPECTED_VERSION 11.0.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS CLANG_EXPECTED_VERSION) message(FATAL_ERROR "Clang: TrinityCore requires version ${CLANG_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index d0f7ebc2f3f..6608190d1bf 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -3,7 +3,7 @@ target_compile_definitions(trinity-compile-option-interface INTERFACE -D_BUILD_DIRECTIVE="$<CONFIG>") -set(GCC_EXPECTED_VERSION 8.3.0) +set(GCC_EXPECTED_VERSION 10.0.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) message(FATAL_ERROR "GCC: TrinityCore requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}") diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 34d9dcf81b1..e743876f479 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -1,8 +1,8 @@ # 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.24) -set(MSVC_EXPECTED_VERSION_STRING "Microsoft Visual Studio 2019 16.4") +set(MSVC_EXPECTED_VERSION 19.30) +set(MSVC_EXPECTED_VERSION_STRING "Microsoft Visual Studio 2022 17") # This file is also used by compilers that pretend to be MSVC but report their own version number - don't version check them if(NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT) @@ -91,12 +91,9 @@ endif() # 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 -if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.23026.0)) - # makes this flag a requirement to build TC at all - target_compile_options(trinity-compile-option-interface - INTERFACE - /Zc:throwingNew) -endif() +target_compile_options(trinity-compile-option-interface + INTERFACE + /Zc:throwingNew) # 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 |