mirror of https://github.com/google/benchmark.git
bump standard to C++14 (#1799)
* update requirements to point to our dependencies doc * bump standard to c++14
This commit is contained in:
parent
7f0e99af54
commit
10199fb48e
|
@ -3,7 +3,7 @@ licenses(["notice"])
|
||||||
COPTS = [
|
COPTS = [
|
||||||
"-pedantic",
|
"-pedantic",
|
||||||
"-pedantic-errors",
|
"-pedantic-errors",
|
||||||
"-std=c++11",
|
"-std=c++14",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Wconversion",
|
"-Wconversion",
|
||||||
"-Wextra",
|
"-Wextra",
|
||||||
|
|
|
@ -138,11 +138,7 @@ if (BENCHMARK_BUILD_32_BITS)
|
||||||
add_required_cxx_compiler_flag(-m32)
|
add_required_cxx_compiler_flag(-m32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
set(BENCHMARK_CXX_STANDARD 14)
|
||||||
set(BENCHMARK_CXX_STANDARD 14)
|
|
||||||
else()
|
|
||||||
set(BENCHMARK_CXX_STANDARD 11)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD ${BENCHMARK_CXX_STANDARD})
|
set(CMAKE_CXX_STANDARD ${BENCHMARK_CXX_STANDARD})
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED YES)
|
set(CMAKE_CXX_STANDARD_REQUIRED YES)
|
||||||
|
|
|
@ -53,12 +53,10 @@ IRC channels:
|
||||||
The library can be used with C++03. However, it requires C++11 to build,
|
The library can be used with C++03. However, it requires C++11 to build,
|
||||||
including compiler and standard library support.
|
including compiler and standard library support.
|
||||||
|
|
||||||
The following minimum versions are required to build the library:
|
_See [dependencies.md](docs/dependencies.md) for more details regarding supported
|
||||||
|
compilers and standards._
|
||||||
|
|
||||||
* GCC 4.8
|
If you have need for a particular compiler to be supported, patches are very welcome.
|
||||||
* Clang 3.4
|
|
||||||
* Visual Studio 14 2015
|
|
||||||
* Intel 2015 Update 1
|
|
||||||
|
|
||||||
See [Platform-Specific Build Instructions](docs/platform_specific_build_instructions.md).
|
See [Platform-Specific Build Instructions](docs/platform_specific_build_instructions.md).
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue