From b4dec55b96921a064530ed46c6879aaf856f1026 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 24 Mar 2014 15:54:09 +0100 Subject: Cmake: Added level restriction for msvc 2013 --- cmake/compiler/msvc/settings.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmake/compiler/msvc') diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index f303b6ed761..e7fe89a750b 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -1,6 +1,12 @@ # 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(MSVS_EXPECTED_VERSION 18.0) + +if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVS_EXPECTED_VERSION) + message(FATAL_ERROR "MSVC: TrinityCore requires version ${MSVS_EXPECTED_VERSION} (MSVC 2013) 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) #set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) #set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -- cgit v1.2.3 From f357597ec12f910a5afb2e4b03c72c1ae55b3e56 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 25 Mar 2014 16:40:22 +0100 Subject: Buildsystem: Changed required CMake version to 2.8.9 and removed a check for version we no longer support in msvc settings --- CMakeLists.txt | 2 +- cmake/compiler/msvc/settings.cmake | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'cmake/compiler/msvc') diff --git a/CMakeLists.txt b/CMakeLists.txt index 45bb3bd58aa..21fa378fad0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.9) cmake_policy(SET CMP0005 OLD) # add this options before PROJECT keyword diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index e7fe89a750b..3194967c346 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(MSVS_EXPECTED_VERSION 18.0) +set(MSVC_EXPECTED_VERSION 18.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVS_EXPECTED_VERSION) - message(FATAL_ERROR "MSVC: TrinityCore requires version ${MSVS_EXPECTED_VERSION} (MSVC 2013) to build but found ${CMAKE_CXX_COMPILER_VERSION}") +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}") endif() # set up output paths ofr static libraries etc (commented out - shown here as an example only) @@ -48,13 +48,10 @@ message(STATUS "MSVC: Disabled NON-SECURE warnings") add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) message(STATUS "MSVC: Disabled POSIX warnings") -# disable warnings in Visual Studio 8 and above if not wanted if(NOT WITH_WARNINGS) - if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") - message(STATUS "MSVC: Disabled generic compiletime warnings") - endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") + message(STATUS "MSVC: Disabled generic compiletime warnings") endif() # Specify the maximum PreCompiled Header memory allocation limit -- cgit v1.2.3