diff options
| author | Mark Jan van Kampen <mjvk@allseas.com> | 2020-04-16 14:26:44 +0200 |
|---|---|---|
| committer | Mark Jan van Kampen <mjvk@allseas.com> | 2020-04-16 14:26:44 +0200 |
| commit | ee01491229cb1394a51504b8fd3de53e2c3d75d9 (patch) | |
| tree | 947876a9003fcf0a3300340bede8f968a030f928 /CMakeLists.txt | |
| parent | 937b3ce9f7afa1b1ab6fde5c09e460ef40813a9f (diff) | |
| parent | e3f0319d89f4cbf32993de595d984183b1a9fc57 (diff) | |
| download | googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.zip googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.tar.gz googletest-ee01491229cb1394a51504b8fd3de53e2c3d75d9.tar.bz2 | |
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 257090c..e516b4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif (POLICY CMP0048) project(googletest-distribution) set(GOOGLETEST_VERSION 1.10.0) -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.1") +if (CMAKE_VERSION VERSION_GREATER "3.0.2") if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) set(CMAKE_CXX_EXTENSIONS OFF) endif() |