Remove special USD handling from simulate CMakeLists.

USD support is now enabled via plugin.

PiperOrigin-RevId: 864491943
Change-Id: Ib0a80413821b0f398ff05bf87c8fb79e93a811e6
This commit is contained in:
Sam Haves
2026-02-02 13:14:45 -08:00
committed by Copybara-Service
parent 49b4790877
commit 8344dba11e
-39
View File
@@ -185,21 +185,6 @@ if(SIMULATE_BUILD_EXECUTABLE)
target_link_libraries(simulate "-framework CoreVideo")
endif()
if (BUILD_WITH_USD)
# pxr/usd/tf/hashset.h might include deprecated headers so disable this check
# when compiling with USD enabled.
target_compile_options(
simulate
PRIVATE -Wno-deprecated
)
target_link_libraries(
simulate
mujoco::usd::mjcf
usd_decoder_plugin
)
endif()
target_link_options(simulate PRIVATE ${MUJOCO_SIMULATE_LINK_OPTIONS})
if(APPLE AND MUJOCO_BUILD_MACOS_FRAMEWORKS)
@@ -266,30 +251,6 @@ if(SIMULATE_BUILD_EXECUTABLE)
MUJOCO_ENABLE_RPATH
)
if (BUILD_WITH_USD)
# pxr/usd/tf/hashset.h might include deprecated headers so disable this check
# when compiling with USD enabled.
target_compile_options(
simulate
PRIVATE -Wno-deprecated
)
# Add support to RPATH for the samples.
target_add_rpath(
TARGETS
simulate
INSTALL_DIRECTORY
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}"
LIB_DIRS
DEPENDS
MUJOCO_ENABLE_RPATH
)
# Do we need this?
#target_link_options(simulate PRIVATE -rpath=${pxr_DIR}/lib)
endif()
if(NOT MUJOCO_SIMULATE_USE_SYSTEM_GLFW)
# We downloaded GLFW. Depending if it is a static or shared LIBRARY we might
# need to install it.