From 23b2a3b1cf803999fb38175f6e9e038a4495c8a5 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 12 Feb 2020 15:41:54 -0500 Subject: 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 --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 755b8b72..d8834096 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) set(CMAKE_CXX_EXTENSIONS OFF) endif() -- cgit v1.2.3