diff options
| author | Mark Jan van Kampen <mjvk@allseas.com> | 2020-02-17 09:41:49 +0100 |
|---|---|---|
| committer | Mark Jan van Kampen <mjvk@allseas.com> | 2020-02-17 09:41:49 +0100 |
| commit | 937b3ce9f7afa1b1ab6fde5c09e460ef40813a9f (patch) | |
| tree | 6ab242a3293efba00cd05228dc83922b9152b12d /CMakeLists.txt | |
| parent | 44517f9888def81f75c1114a0a881bd716331132 (diff) | |
| parent | 23b2a3b1cf803999fb38175f6e9e038a4495c8a5 (diff) | |
| download | googletest-git-937b3ce9f7afa1b1ab6fde5c09e460ef40813a9f.tar.gz | |
Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c8188aa..257090c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,7 @@ endif (POLICY CMP0048) project(googletest-distribution) set(GOOGLETEST_VERSION 1.10.0) -if (CMAKE_VERSION VERSION_LESS "3.1") - add_definitions(-std=c++11) -else() - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.1") if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) endif() |