Bump MuJoCo version to 2.3.2.
PiperOrigin-RevId: 507720557 Change-Id: I7a5b577094ac1a7f468a84c484f62f61dc6b409f
This commit is contained in:
committed by
Copybara-Service
parent
36836d8e42
commit
dd632b7ccc
@@ -24,7 +24,7 @@ set(MSVC_INCREMENTAL_DEFAULT ON)
|
||||
|
||||
project(
|
||||
mujoco_samples
|
||||
VERSION 2.3.1
|
||||
VERSION 2.3.2
|
||||
DESCRIPTION "MuJoCo samples binaries"
|
||||
HOMEPAGE_URL "https://mujoco.org"
|
||||
)
|
||||
|
||||
@@ -20,6 +20,9 @@ function(get_avx_compile_options OUTPUT_VAR)
|
||||
|
||||
if(MSVC)
|
||||
set(CMAKE_REQUIRED_FLAGS "/arch:AVX")
|
||||
elseif(WIN32)
|
||||
# Abseil LTS 20230125.0 assumes that AVX implies PCLMUL on Windows.
|
||||
set(CMAKE_REQUIRED_FLAGS "-mavx" "-mpclmul")
|
||||
else()
|
||||
set(CMAKE_REQUIRED_FLAGS "-mavx")
|
||||
endif()
|
||||
|
||||
@@ -95,12 +95,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
|
||||
-Wno-stringop-overflow
|
||||
-Wno-stringop-truncation
|
||||
)
|
||||
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0")
|
||||
# Needed for https://github.com/abseil/abseil-cpp/issues/1201, until a new
|
||||
# version of abseil is released with the fix.
|
||||
set(EXTRA_COMPILE_OPTIONS "${EXTRA_COMPILE_OPTIONS}"
|
||||
-Wno-deprecated-builtins
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user