Update benchmark dep and add workaround for Clang breakage.
PiperOrigin-RevId: 869687267 Change-Id: If4ce7a107b1489b30475d8778e7347503298dbbe
This commit is contained in:
committed by
Copybara-Service
parent
42958aab81
commit
84f254f7c7
@@ -54,7 +54,7 @@ set(MUJOCO_DEP_VERSION_gtest
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(MUJOCO_DEP_VERSION_benchmark
|
set(MUJOCO_DEP_VERSION_benchmark
|
||||||
5f7d66929fb66869d96dfcbacf0d8a586b33766d
|
5c55f5d4f45a1b09c5d98aa63a671993ebd42c69
|
||||||
CACHE STRING "Version of `benchmark` to be fetched."
|
CACHE STRING "Version of `benchmark` to be fetched."
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -339,9 +339,7 @@ if(MUJOCO_BUILD_TESTS)
|
|||||||
"sed"
|
"sed"
|
||||||
"-i"
|
"-i"
|
||||||
"-e"
|
"-e"
|
||||||
"s/-std=c++11/-std=c++14/g"
|
"s/-Wformat=2/-Wformat/g"
|
||||||
"-e"
|
|
||||||
"s/HAVE_CXX_FLAG_STD_CXX11/HAVE_CXX_FLAG_STD_CXX14/g"
|
|
||||||
"${CMAKE_BINARY_DIR}/_deps/benchmark-src/CMakeLists.txt"
|
"${CMAKE_BINARY_DIR}/_deps/benchmark-src/CMakeLists.txt"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user