Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ build/data
build/docs
build/lua
build/bin
build/lib
build/depends
build/library
build/package
Expand Down
5 changes: 0 additions & 5 deletions depends/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion depends/googletest
Submodule googletest updated 375 files
Loading