aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNayd <dnpd.dd@gmail.com>2014-12-29 20:55:26 +0000
committerNayd <dnpd.dd@gmail.com>2014-12-29 20:55:53 +0000
commit56a665ccf35bd523221a52d7483545761fda9d65 (patch)
tree6afc81ed08b8a23ca0a8829093965f58bfa6cb6b
parent8176f9982e04920dacf2094803a8ea737b0a3019 (diff)
CMake: Require VS 2013 Update 3
Update 4 (includes 3) can be downloaded at http://www.microsoft.com/en-us/download/details.aspx?id=44921 Closes #13813
-rw-r--r--README.md2
-rw-r--r--cmake/compiler/msvc/settings.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 71c78873b03..f6e0a26ffec 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ website at [TrinityCore.org](http://www.trinitycore.org).
+ CMake ≥ 2.8.11.2 / 2.8.9 (Windows / Linux)
+ OpenSSL ≥ 1.0.0
+ GCC ≥ 4.7.2 (Linux only)
-+ MS Visual Studio ≥ 12 (2013) (Windows only)
++ MS Visual Studio ≥ 12 (2013 Update 3) (Windows only)
## Install
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
index 412452f3b82..c631bdeb631 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.30324) # 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)