Enable building Studio (Linux only) as a component of the main MuJoCo build.
And remove the separate, conditional (and hacky) "build_studio" step. PiperOrigin-RevId: 934375150 Change-Id: I46514d0f33c17bb29625b818cdde3a285fd2c439
This commit is contained in:
committed by
Copybara-Service
parent
1f8c6f1183
commit
8db92ab4a9
@@ -68,3 +68,18 @@ target_include_directories(implot PRIVATE ../dear_imgui)
|
||||
set_target_properties(implot PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../implot"
|
||||
)
|
||||
|
||||
# Workaround for duplicate symbol error (wp_fractional_scale_manager_v1_interface)
|
||||
# when linking both GLFW (via Filament) and SDL2 statically on Linux.
|
||||
if(UNIX AND NOT APPLE)
|
||||
set(STUDIO_PY_MODULES
|
||||
parser
|
||||
native_viewer_cc
|
||||
renderer
|
||||
ux
|
||||
sim
|
||||
)
|
||||
foreach(target ${STUDIO_PY_MODULES})
|
||||
target_link_options(${target} PRIVATE "-Wl,--allow-multiple-definition")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user