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

Fix Windows CMake patch application and add more logging.

Browse Source 
PiperOrigin-RevId: 953024686
Change-Id: I5527f52b7473e74a9203916d866a6a91c01a06c9
This commit is contained in:
Michael Moss
2026-07-23 16:43:34 -07:00
committed by Copybara-Service
parent fe9dc58477
commit a9f56dabc2
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/third_party_deps/filament.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ if(WIN32)
endif()
set(FILAMENT_PATCH_COMMAND
git apply --reject --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/filament-allow-clang-windows.patch
git -c core.autocrlf=false -c core.whitespace=cr-at-eol apply --verbose --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/filament-allow-clang-windows.patch
)
fetchpackage(
cmake/third_party_deps/libwebp.cmake
+1 -3
View File
@@ -21,7 +21,7 @@ mark_as_advanced(MUJOCO_DEP_VERSION_libwebp)
include(FindOrFetch)
set(LIBWEBP_PATCH_COMMAND
git apply --reject --whitespace=fix ${mujoco_SOURCE_DIR}/cmake/libwebp-apple-float16.patch
git -c core.autocrlf=false -c core.whitespace=cr-at-eol apply --verbose --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/libwebp-apple-float16.patch
)
set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
@@ -36,5 +36,3 @@ fetchpackage(
)
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD})