Skip to content

Commit 3c69bf2

Browse files
committed
update to recent googletest
1 parent 35c24ef commit 3c69bf2

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ build/data
3434
build/docs
3535
build/lua
3636
build/bin
37+
build/lib
3738
build/depends
3839
build/library
3940
build/package

depends/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,8 @@ if(UNIX)
1515
set_target_properties(protobuf PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -Wno-restrict")
1616
endif()
1717

18-
if(UNIX AND NOT APPLE) # remove this once our MSVC build env has been updated
1918
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
2019
add_subdirectory(googletest)
21-
if(UNIX)
22-
set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized -Wno-sign-compare -Wno-restrict")
23-
endif()
24-
endif()
2520

2621
# Don't build tinyxml if it's being externally linked against.
2722
if(NOT TinyXML_FOUND)

depends/googletest

Submodule googletest updated 375 files

0 commit comments

Comments
 (0)