diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 9 | ||||
| -rw-r--r-- | cmake/genrev.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/CheckBuildDir.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/FindGit.cmake | 2 | ||||
| -rw-r--r-- | cmake/options.cmake | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index a455e97cc21..0416ff6fc7f 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -1,10 +1,10 @@ # 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 18.0) +set(MSVC_EXPECTED_VERSION 18.0.30723) # MSVC Update 3 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVC_EXPECTED_VERSION) - message(FATAL_ERROR "MSVC: TrinityCore requires version ${MSVC_EXPECTED_VERSION} (MSVC 2013) to build but found ${CMAKE_CXX_COMPILER_VERSION}") + message(FATAL_ERROR "MSVC: TrinityCore requires version ${MSVC_EXPECTED_VERSION} (MSVC 2013 Update 3) to build but found ${CMAKE_CXX_COMPILER_VERSION}") endif() # set up output paths ofr static libraries etc (commented out - shown here as an example only) @@ -47,10 +47,13 @@ message(STATUS "MSVC: Overloaded standard names") add_definitions(-D_CRT_SECURE_NO_WARNINGS) message(STATUS "MSVC: Disabled NON-SECURE warnings") -#Ignore warnings about POSIX deprecation +# Ignore warnings about POSIX deprecation add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) message(STATUS "MSVC: Disabled POSIX warnings") +# Ignore C4351: new behavior: elements of array 'x' will be default initialized +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4351") + if(NOT WITH_WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619 /wd4512") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619 /wd4512") diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index 26c26d8ad62..c34e9d75973 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> +# Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake index aff1caf362d..9a89de0b29d 100644 --- a/cmake/macros/CheckBuildDir.cmake +++ b/cmake/macros/CheckBuildDir.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> +# Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake index d8b82cb04fe..f5b0c6a9a3b 100644 --- a/cmake/macros/FindGit.cmake +++ b/cmake/macros/FindGit.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> +# Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/options.cmake b/cmake/options.cmake index 3002658a729..e55ae7e6041 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> +# Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without |