Googletest export

Remove the CMAKE_CXX_STANDARD from GoogleTest's CMakeLists.txt This causes ABI issues since it can create a mixed-mode build. The value should be inherited from the top-level build if it needs to be set. PiperOrigin-RevId: 294730724

Googletest export
23b2a3b1 · Abseil Team · Mark Barolak · 6f5fd0d7 · 23b2a3b1
Commit 23b2a3b1 authored Feb 12, 2020 by Abseil Team Committed by Mark Barolak Feb 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

CMakeLists.txt CMakeLists.txt +1 -5

No files found.
--- 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)
    set(CMAKE_CXX_EXTENSIONS OFF)
  endif()