diff options
| author | Mattes D <github@xoft.cz> | 2014-09-06 20:35:51 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-09-06 20:35:51 +0200 |
| commit | c71a37012c88202563b58fdde78717b12322170a (patch) | |
| tree | 450c08b9c11c6a982bd5ce6b1cdf96e8ac4b822c | |
| parent | Added missing newline. (diff) | |
| parent | Update SetFlags.cmake (diff) | |
| download | cuberite-c71a37012c88202563b58fdde78717b12322170a.tar cuberite-c71a37012c88202563b58fdde78717b12322170a.tar.gz cuberite-c71a37012c88202563b58fdde78717b12322170a.tar.bz2 cuberite-c71a37012c88202563b58fdde78717b12322170a.tar.lz cuberite-c71a37012c88202563b58fdde78717b12322170a.tar.xz cuberite-c71a37012c88202563b58fdde78717b12322170a.tar.zst cuberite-c71a37012c88202563b58fdde78717b12322170a.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SetFlags.cmake | 31 |
2 files changed, 27 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dd9b1e67c..4c47eb509 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.2) +cmake_minimum_required (VERSION 2.8.7) # Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html ) enable_language(CXX C) diff --git a/SetFlags.cmake b/SetFlags.cmake index 0e2e0c277..0835189ad 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -205,6 +205,15 @@ macro(enable_profile) endif() endmacro() +#this is a hack because we can't use cmake 2.8.10 because of travis +macro(get_clang_version) + execute_process( + COMMAND "${CMAKE_CXX_COMPILER}" "--version" + OUTPUT_VARIABLE CLANG_VERSION_OUTPUT) + string(REGEX MATCH "version ([0-9]\\.[0-9])" x ${CLANG_VERSION_OUTPUT}) + set(CLANG_VERSION ${CMAKE_MATCH_1}) +endmacro() + macro(set_exe_flags) # Remove disabling the maximum warning level: # clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings @@ -223,17 +232,29 @@ macro(set_exe_flags) add_flags_cxx("-ffast-math") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + get_clang_version() + if ("${CLANG_VERSION}" VERSION_LESS 3.0) + message(FATAL_ERROR "MCServer requires clang version 3.0 or higher, version is ${CLANG_VERSION}") + endif() # clang does not provide the __extern_always_inline macro and a part of libm depends on this when using fast-math add_flags_cxx("-D__extern_always_inline=inline") add_flags_cxx("-Werror -Weverything -Wno-c++98-compat-pedantic -Wno-string-conversion") - add_flags_cxx("-Wno-error=switch-enum -Wno-documentation -Wno-exit-time-destructors") + add_flags_cxx("-Wno-error=switch-enum -Wno-exit-time-destructors") add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-padded") add_flags_cxx("-Wno-error=deprecated -Wno-error=weak-vtables -Wno-error=float-equal") add_flags_cxx("-Wno-error=missing-prototypes -Wno-error=non-virtual-dtor") - add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=shadow -Wno-error=old-style-cast") - add_flags_cxx("-Wno-error=exit-time-destructors -Wno-error=missing-variable-declarations") - add_flags_cxx("-Wno-error=global-constructors -Wno-implicit-fallthrough") - add_flags_cxx("-Wno-error=extra-semi -Wno-weak-vtables -Wno-switch-enum") + add_flags_cxx("-Wno-error=shadow -Wno-error=old-style-cast -Wno-error=global-constructors") + add_flags_cxx("-Wno-error=exit-time-destructors") + add_flags_cxx("-Wno-weak-vtables -Wno-switch-enum") + if ("${CLANG_VERSION}" VERSION_GREATER 3.0) + # flags that are not present in 3.0 + add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=missing-variable-declarations") + add_flags_cxx("-Wno-implicit-fallthrough -Wno-error=extra-semi") + endif() + if ("${CLANG_VERSION}" VERSION_GREATER 3.1) + # flags introduced in 3.2 + add_flags_cxx("-Wno-documentation") + endif() endif() endif() |