From 3c69bf25b2004b9031df171d0d927760f56aaaa9 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 22 Dec 2024 00:17:01 -0800 Subject: [PATCH] update to recent googletest --- .gitignore | 1 + depends/CMakeLists.txt | 5 ----- depends/googletest | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5b4c7f6fbc..60a0e1b6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ build/data build/docs build/lua build/bin +build/lib build/depends build/library build/package diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 6b23c1f527..b0bc753849 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -15,13 +15,8 @@ if(UNIX) set_target_properties(protobuf PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict") endif() -if(UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF) add_subdirectory(googletest) -if(UNIX) - set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare -Wno-restrict") -endif() -endif() # Don't build tinyxml if it's being externally linked against. if(NOT TinyXML_FOUND) diff --git a/depends/googletest b/depends/googletest index 2fe3bd994b..b514bdc898 160000 --- a/depends/googletest +++ b/depends/googletest @@ -1 +1 @@ -Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2 +Subproject commit b514bdc898e2951020cbdca1304b75f5950d1f59