chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #935 from traversaro:patch-25

Browse Source 
PiperOrigin-RevId: 542013022
Change-Id: I1339ff72c961e815143e9ab423497f603a4b2dd4
This commit is contained in:
Copybara-Service
2023-06-20 12:23:49 -07:00
parent 0945af7b8a 06decde594
commit 516c5a8bbe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/MujocoDependencies.cmake
+4 -4
View File
@@ -14,10 +14,6 @@
# Build configuration for third party libraries used in MuJoCo.
# Override the BUILD_SHARED_LIBS setting, just for building third party libs (since we always want
# static libraries). The ccd CMakeLists.txt doesn't expose an option to build a static ccd library,
# unless BUILD_SHARED_LIBS is set.
set(MUJOCO_DEP_VERSION_lodepng
b4ed2cd7ecf61d29076169b49199371456d4f90b
CACHE STRING "Version of `lodepng` to be fetched."
@@ -71,6 +67,10 @@ mark_as_advanced(MUJOCO_DEP_VERSION_benchmark)
include(FetchContent)
include(FindOrFetch)
# Override the BUILD_SHARED_LIBS setting, just for building third party libs (since we always want
# static libraries). The ccd CMakeLists.txt doesn't expose an option to build a static ccd library,
# unless BUILD_SHARED_LIBS is set.
# We force all the dependencies to be compiled as static libraries.
# TODO(fraromano) Revisit this choice when adding support for install.
set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})