update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / googletest / CMakeLists.txt

diff --git a/ceph/src/googletest/CMakeLists.txt b/ceph/src/googletest/CMakeLists.txt
index 755b8b72b56df34115a4f11bfa829251cc603aa6..12fd7450d01e9d4ead650e51491a78f23b28475b 100644 (file)
--- a/ceph/src/googletest/CMakeLists.txt
+++ b/ceph/src/googletest/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Note: CMake support is community-based. The maintainers do not use CMake
 # internally.
 
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.12)
 
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
@@ -10,12 +10,8 @@ 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(NOT CYGWIN AND NOT MSYS)
+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()
 endif()