Update dependencies ahead of the 3.11.0 release (retry).
Also updates MuJoCo files needed to address changes in Filament. - "build with clang on windows" patch to sync context lines, remove some upstream conflicts, disable Clang thread-safety attribute errors, and allow running on MSYS2. - Skip building Filament samples. - Add missing <string_view> to material_manager.cc.
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
set(MUJOCO_DEP_VERSION_dear_imgui
|
||||
3109131a882daec56a530aff540416983c240443
|
||||
913a3c60561bb07e8fd410ec7d4a8f6f485defd6
|
||||
CACHE STRING "Tag/version of `dear_imgui` to be fetched."
|
||||
)
|
||||
mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
set(MUJOCO_DEP_VERSION_filament
|
||||
da22932b543b59810caf490d7f9e8859ec3fe204
|
||||
10d2fc35128c2bc41ec4a1913c288d5df24afdaf
|
||||
CACHE STRING "Tag/version of `filament` to be fetched."
|
||||
)
|
||||
mark_as_advanced(MUJOCO_DEP_VERSION_filament)
|
||||
@@ -39,6 +39,7 @@ endif()
|
||||
|
||||
set(FILAMENT_ENABLE_EXPERIMENTAL_GCC_SUPPORT ON)
|
||||
set(FILAMENT_SKIP_SDL2 ON)
|
||||
set(FILAMENT_SKIP_SAMPLES ON)
|
||||
set(FILAMENT_USE_EXTERNAL_ABSL ON)
|
||||
set(FILAMENT_USE_EXTERNAL_BENCHMARK ON)
|
||||
set(FILAMENT_USE_EXTERNAL_GTEST ON)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
set(MUJOCO_DEP_VERSION_implot
|
||||
0d4d87c3e005349c1aeb7ceacfd20a67f23c42b8
|
||||
ec7306ceb99d19ff193eb30dc74fa3598f5e7dc6
|
||||
CACHE STRING "Tag/version of `implot` to be fetched."
|
||||
)
|
||||
mark_as_advanced(MUJOCO_DEP_VERSION_implot)
|
||||
|
||||
Reference in New Issue
Block a user