diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-24 23:18:50 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-24 23:18:50 -0400 |
| commit | 299d098daa16533a11cd9070d170d3d95c0793f5 (patch) | |
| tree | b7f5433fce3803d121c9963dc69bcdeec4d35f7c /CMakeLists.txt | |
| parent | 2801b238078750da1cb5e1f8519a3caa749df753 (diff) | |
| parent | 8ec8ce1c8a51076950bfa7a7886d95f4c8aed11b (diff) | |
| download | googletest-299d098daa16533a11cd9070d170d3d95c0793f5.tar.gz googletest-299d098daa16533a11cd9070d170d3d95c0793f5.tar.bz2 googletest-299d098daa16533a11cd9070d170d3d95c0793f5.zip | |
Merge branch 'master' of https://github.com/google/googletest
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 572dac00..be14229e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,12 @@ cmake_minimum_required(VERSION 2.8.8) -add_definitions(-std=c++11) + +if (CMAKE_VERSION VERSION_LESS "3.1") + add_definitions(-std=c++11) +else() + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +endif() if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) |