Skip to content

Commit

Permalink
third_party: update googletest to current main
Browse files Browse the repository at this point in the history
Update the pinned revision for googletest to pick up
google/googletest#2815 which should allow us to repair the macOS builds.

Add a workaround for dependency tracking to try to avoid a build race.
  • Loading branch information
compnerd committed Nov 10, 2022
1 parent c8d4c1f commit dede4cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ if(UNIX OR MINGW)
list(APPEND LIBBLOATY_LIBS ${CAPSTONE_LIBRARIES})
else()
list(APPEND LIBBLOATY_LIBS capstone-static)
add_dependencies(libbloaty capstone-static)
endif()
if(ZLIB_FOUND)
list(APPEND LIBBLOATY_LIBS ZLIB::ZLIB)
Expand All @@ -292,6 +293,7 @@ if(UNIX OR MINGW)
endif()
else()
set(LIBBLOATY_LIBS libbloaty libprotoc capstone-static)
add_dependencies(libbloaty capstone-static)
if(BLOATY_ENABLE_RE2)
list(APPEND LIBBLOATY_LIBS re2)
endif()
Expand Down
2 changes: 1 addition & 1 deletion third_party/googletest
Submodule googletest updated 211 files

0 comments on commit dede4cf

Please sign in to comment.