Merge branch 'master' of https://github.com/google/googletest into cmake-QNX-fix

# Conflicts: # CMakeLists.txt
2020-04-16 14:26:44 +02:00
parent 937b3ce9f7 e3f0319d89
commit ee01491229
28 changed files with 1286 additions and 602 deletions
--- 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()