From 62cad70530c0812d6efa30373576137c5c56258a Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Tue, 24 May 2022 17:23:46 +0000 Subject: [PATCH] #1807: revert to previous custom gtest CMakeLists while using 1.11.0 --- tests/extern/googletest/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/extern/googletest/CMakeLists.txt b/tests/extern/googletest/CMakeLists.txt index 647979e8a3..85d062fc4a 100644 --- a/tests/extern/googletest/CMakeLists.txt +++ b/tests/extern/googletest/CMakeLists.txt @@ -10,8 +10,12 @@ endif (POLICY CMP0048) project(googletest-distribution) set(GOOGLETEST_VERSION 1.11.0) -if (CMAKE_VERSION VERSION_GREATER "3.0.2") - if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) +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) set(CMAKE_CXX_EXTENSIONS OFF) endif() endif() @@ -30,3 +34,4 @@ if(BUILD_GMOCK) else() add_subdirectory( googletest ) endif() +