diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-06 16:30:13 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-06 16:30:13 +0200 |
| commit | 5fa206a4208b64b4a536bf7e2ab49affc56500d4 (patch) | |
| tree | f4bde6e7e4955a0ca3438332845b36a673b651a4 | |
| parent | Wrong cmake var (diff) | |
| download | cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar.gz cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar.bz2 cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar.lz cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar.xz cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.tar.zst cuberite-5fa206a4208b64b4a536bf7e2ab49affc56500d4.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SetFlags.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dd9b1e67c..a00ed84c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.2) +cmake_minimum_required (VERSION 2.8.10) # 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 69a9a59a0..476a15516 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -236,12 +236,12 @@ macro(set_exe_flags) 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_STRING VERSION_MORE 3.0) + if ("${CMAKE_CXX_COMPILER_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_STRING VERSION_MORE 3.1) + if ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER 3.1) # flags introduced in 3.2 add_flags_cxx("-Wno-documentation") endif() |