Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Actually update to 1.6.1. #25

Merged
merged 1 commit into from
Feb 9, 2023
Merged

Actually update to 1.6.1. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ macro(build_benchmark)

externalproject_add(benchmark-${GOOGLE_BENCHMARK_TARGET_VERSION}
GIT_REPOSITORY https://github.com/google/benchmark.git
GIT_TAG c05843a9f622db08ad59804c190f98879b76beba # v${GOOGLE_BENCHMARK_TARGET_VERSION}
GIT_TAG 0d98dba29d66e93259db7daa53a9327df767a415 # v${GOOGLE_BENCHMARK_TARGET_VERSION}
GIT_CONFIG advice.detachedHead=false
# Suppress git update due to https://gitlab.kitware.com/cmake/cmake/-/issues/16419
# See https://github.com/ament/uncrustify_vendor/pull/22 for details
Expand All @@ -68,7 +68,6 @@ macro(build_benchmark)
PATCH_COMMAND
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn
${CMAKE_CURRENT_SOURCE_DIR}/thread_safety_attributes.patch
${CMAKE_CURRENT_SOURCE_DIR}/e991355c02b93fe17713efe04cbc2e278e00fdbd.patch
)

# The external project will install to the build folder, but we'll install that on make install.
Expand Down
31 changes: 0 additions & 31 deletions e991355c02b93fe17713efe04cbc2e278e00fdbd.patch
View file
Open in desktop

This file was deleted.