1
0

bumped cmake version min and fixed clang support

This commit is contained in:
Tycho 2014-09-06 15:30:13 +01:00
parent f7d06f093e
commit 5fa206a420
2 changed files with 3 additions and 3 deletions

View File

@ -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 ) # 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) enable_language(CXX C)

View File

@ -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=shadow -Wno-error=old-style-cast -Wno-error=global-constructors")
add_flags_cxx("-Wno-error=exit-time-destructors") add_flags_cxx("-Wno-error=exit-time-destructors")
add_flags_cxx("-Wno-weak-vtables -Wno-switch-enum") 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 # 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-error=covered-switch-default -Wno-error=missing-variable-declarations")
add_flags_cxx("-Wno-implicit-fallthrough -Wno-error=extra-semi") add_flags_cxx("-Wno-implicit-fallthrough -Wno-error=extra-semi")
endif() endif()
if (CLANG_VERSION_STRING VERSION_MORE 3.1) if ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER 3.1)
# flags introduced in 3.2 # flags introduced in 3.2
add_flags_cxx("-Wno-documentation") add_flags_cxx("-Wno-documentation")
endif() endif()