From 508d22f7940f16cec7fd0656edf50422604a5089 Mon Sep 17 00:00:00 2001 From: Michiel Blokzijl Date: Thu, 28 Aug 2025 07:23:14 -0700 Subject: [PATCH] Update the GLFW dependency used by MuJoCo to 3.4. This makes it possible to build open-source MuJoCo with Wayland support out of the box. Currently, it is necessary to run cmake with -DGLFW_USE_WAYLAND=ON and ensure cmake can find the "ECM" package somehow (a dependency of the 3.3.6 version of GLFW), for which there is no automated fetching setup. As this is no longer a dependency of GLFW it seems to make more sense to update GLFW to make out of the box builds on Wayland. PiperOrigin-RevId: 800456607 Change-Id: Iffdf1d65319bfb134e580faceb63ac3bed7b9c84 --- sample/cmake/SampleDependencies.cmake | 2 +- simulate/cmake/SimulateDependencies.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/cmake/SampleDependencies.cmake b/sample/cmake/SampleDependencies.cmake index 6d0dcbad..5365ab10 100644 --- a/sample/cmake/SampleDependencies.cmake +++ b/sample/cmake/SampleDependencies.cmake @@ -30,7 +30,7 @@ option(MUJOCO_SAMPLES_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF) option(MUJOCO_SAMPLES_USE_SYSTEM_GLFW "Use installed GLFW version." OFF) set(MUJOCO_DEP_VERSION_glfw3 - 7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8 + 7b6aead9fb88b3623e3b3725ebb42670cbe4c579 # 3.4 CACHE STRING "Version of `glfw` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_glfw3) diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake index 5141406c..4e910520 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -30,7 +30,7 @@ option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF) option(MUJOCO_SIMULATE_USE_SYSTEM_GLFW "Use installed GLFW version." OFF) set(MUJOCO_DEP_VERSION_glfw3 - 7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8 + 7b6aead9fb88b3623e3b3725ebb42670cbe4c579 # 3.4 CACHE STRING "Version of `glfw` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_glfw3)