diff options
author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-02-08 18:14:09 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-21 01:20:51 +0100 |
commit | fe489e2be1312bc559d0c38691c9741ad69cfec8 (patch) | |
tree | 5d163f9596bdad32453a9b41792fabbbe2ec8395 /cmake/compiler/gcc | |
parent | 172e5c3577f99331743f7d3c81de738811781552 (diff) |
Build: Enable and require c++17 (#23868)
* Build: Enable and require c++17
* Build: Raise Visual Studio version from 2017 15.2 to 2017 15.9
* Build: Raise GCC version from 6.3.0 to 7.1.0
* Reduce branch differences
* Fix build after latest merge
* Cleanup after latest merge
(cherry picked from commit 726d5e91b55d4742dcbd6b0a82d84788dbb117b7)
Diffstat (limited to 'cmake/compiler/gcc')
-rw-r--r-- | cmake/compiler/gcc/settings.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index abf9fa5acf7..db69064ebce 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 6.3.0) +set(GCC_EXPECTED_VERSION 7.1.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}") |