diff --git a/cmake/FindOrFetch.cmake b/cmake/FindOrFetch.cmake index 3dce15f2..d849efdc 100644 --- a/cmake/FindOrFetch.cmake +++ b/cmake/FindOrFetch.cmake @@ -125,6 +125,7 @@ if(NOT COMMAND FindOrFetch) set(_WRAPPED_PATCH_COMMAND) endif() + set(FETCHCONTENT_QUIET OFF) if(USE_LOCAL_TARBALL) message(STATUS "mujoco::FindOrFetch: Using package cache for ${_ARGS_LIBRARY_NAME}: ${TARBALL_PATH}") FetchContent_Declare( diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake index 9d7a5656..3dda8823 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake @@ -129,7 +129,7 @@ endif() set(QHULL_ENABLE_TESTING OFF) # Patch changes in https://github.com/qhull/qhull/pull/173.patch set(QHULL_PATCH_COMMAND - git apply --reject --whitespace=fix ${mujoco_SOURCE_DIR}/cmake/qhull-support-emscripten.patch + git -c core.autocrlf=false -c core.whitespace=cr-at-eol apply --verbose --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/qhull-support-emscripten.patch ) findorfetch( @@ -210,7 +210,7 @@ set(CCD_HIDE_ALL_SYMBOLS ON) # Patch changes in https://github.com/danfis/libccd/pull/83.patch set(CCD_PATCH_COMMAND - git apply --reject --whitespace=fix ${mujoco_SOURCE_DIR}/cmake/ccd-support-emscripten.patch + git -c core.autocrlf=false -c core.whitespace=cr-at-eol apply --verbose --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/ccd-support-emscripten.patch ) # update cmake_minimum_required version for compatibility with newer version of cmake @@ -284,7 +284,7 @@ if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT) ) set(ABSL_PATCH_COMMAND - git apply --reject --whitespace=fix ${mujoco_SOURCE_DIR}/cmake/abseil-cpp-source_location.patch + git -c core.autocrlf=false -c core.whitespace=cr-at-eol apply --verbose --whitespace=fix --ignore-space-change ${mujoco_SOURCE_DIR}/cmake/abseil-cpp-source_location.patch ) set(ABSL_BUILD_TESTING OFF) findorfetch( diff --git a/cmake/third_party_deps/filament.cmake b/cmake/third_party_deps/filament.cmake index c4b95082..97cbc07a 100644 --- a/cmake/third_party_deps/filament.cmake +++ b/cmake/third_party_deps/filament.cmake @@ -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( diff --git a/cmake/third_party_deps/libwebp.cmake b/cmake/third_party_deps/libwebp.cmake index b971c029..1a59a409 100644 --- a/cmake/third_party_deps/libwebp.cmake +++ b/cmake/third_party_deps/libwebp.cmake @@ -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}) - - diff --git a/sample/cmake/FindOrFetch.cmake b/sample/cmake/FindOrFetch.cmake index 3dce15f2..d849efdc 100644 --- a/sample/cmake/FindOrFetch.cmake +++ b/sample/cmake/FindOrFetch.cmake @@ -125,6 +125,7 @@ if(NOT COMMAND FindOrFetch) set(_WRAPPED_PATCH_COMMAND) endif() + set(FETCHCONTENT_QUIET OFF) if(USE_LOCAL_TARBALL) message(STATUS "mujoco::FindOrFetch: Using package cache for ${_ARGS_LIBRARY_NAME}: ${TARBALL_PATH}") FetchContent_Declare( diff --git a/simulate/cmake/FindOrFetch.cmake b/simulate/cmake/FindOrFetch.cmake index 3dce15f2..d849efdc 100644 --- a/simulate/cmake/FindOrFetch.cmake +++ b/simulate/cmake/FindOrFetch.cmake @@ -125,6 +125,7 @@ if(NOT COMMAND FindOrFetch) set(_WRAPPED_PATCH_COMMAND) endif() + set(FETCHCONTENT_QUIET OFF) if(USE_LOCAL_TARBALL) message(STATUS "mujoco::FindOrFetch: Using package cache for ${_ARGS_LIBRARY_NAME}: ${TARBALL_PATH}") FetchContent_Declare(