diff options
author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-02-08 18:14:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-08 18:14:09 +0100 |
commit | 726d5e91b55d4742dcbd6b0a82d84788dbb117b7 (patch) | |
tree | 1afe5617f988847f8e9f428ee50eebf45aaef1dd /cmake/compiler/gcc | |
parent | 5fa77744e4495a77dea734330d5ae9e113b8a7f1 (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
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 b2d427ecbeb..c0d806c3d64 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="${CMAKE_BUILD_TYPE}") -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}") |