Skip to content

Commit

Permalink
Go back to an abseil version that works with the latest grpc.
Browse files Browse the repository at this point in the history
The line that was setting MUJOCO_DEP_VERSION_abseil in CMakeLists.txt actually did nothing, because that variable was set by the MuJoCo CMakeLists, and cache values don't get overridden by default (https://cmake.org/cmake/help/latest/command/set.html#set-cache-entry).

I removed the other calls to `set` that do nothing.

PiperOrigin-RevId: 604925771
Change-Id: Ie649282cb28fdf11d4d61ffe6e76b1e4d22133da
  • Loading branch information
nimrod-gileadi authored and copybara-github committed Feb 7, 2024
1 parent e28230c commit 32309a8
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,12 @@ findorfetch(
EXCLUDE_FROM_ALL
)

# TODO(nimrod): Update to the latest version of abseil, or use the one defined
# by MuJoCo, once grpc fix their build issues.
set(MUJOCO_DEP_VERSION_abseil
c8a2f92586fe9b4e1aff049108f5db8064924d8e # LTS 20230125.1
fb3621f4f897824c0dbe0615fa94543df6192f30 # LTS 20230802.1
CACHE STRING "Version of `abseil` to be fetched."
)

set(MUJOCO_DEP_VERSION_glfw3
7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8
CACHE STRING "Version of `glfw` to be fetched."
)

set(MJPC_DEP_VERSION_lodepng
b4ed2cd7ecf61d29076169b49199371456d4f90b
CACHE STRING "Version of `lodepng` to be fetched."
FORCE
)

set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
Expand Down

0 comments on commit 32309a8

Please sign in to comment.