From 492b6a72ec554d556cf4f0816c13d704235d2cad Mon Sep 17 00:00:00 2001
From: Alessio Quaglino <quaglino@google.com>
Date: Fri, 15 Sep 2023 02:57:57 -0700
Subject: [PATCH] Prevent patches to be applied to an already patched
 dependency.

See https://gitlab.kitware.com/cmake/cmake/-/issues/21146

BEGIN_PUBLIC
Prevent patches to be applied to an already patched dependency.
END_PUBLIC

PiperOrigin-RevId: 565624168
Change-Id: I29b36d2cd02f58d5d9e84f9cae5e5bbf8be1b404
---
 cmake/FindOrFetch.cmake          | 1 +
 cmake/MujocoDependencies.cmake   | 2 +-
 sample/cmake/FindOrFetch.cmake   | 1 +
 simulate/cmake/FindOrFetch.cmake | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/FindOrFetch.cmake b/cmake/FindOrFetch.cmake
index 602601f5..f311b2c5 100644
--- a/cmake/FindOrFetch.cmake
+++ b/cmake/FindOrFetch.cmake
@@ -118,6 +118,7 @@ macro(FindOrFetch)
         GIT_TAG ${_ARGS_GIT_TAG}
         GIT_SHALLOW FALSE
         PATCH_COMMAND ${_ARGS_PATCH_COMMAND}
+        UPDATE_DISCONNECTED TRUE
       )
       if(${_ARGS_EXCLUDE_FROM_ALL})
         FetchContent_GetProperties(${_ARGS_LIBRARY_NAME})
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
index c73e7ba1..cc4f0bc1 100644
--- a/cmake/MujocoDependencies.cmake
+++ b/cmake/MujocoDependencies.cmake
@@ -60,7 +60,7 @@ set(MUJOCO_DEP_VERSION_benchmark
 
 set(MUJOCO_DEP_VERSION_sdflib
     492847fa81e46653114da48e8886730ccefed377
-    CACHE STRING "Version of `openVDB` to be fetched."
+    CACHE STRING "Version of `SdfLib` to be fetched."
 )
 
 mark_as_advanced(MUJOCO_DEP_VERSION_lodepng)
diff --git a/sample/cmake/FindOrFetch.cmake b/sample/cmake/FindOrFetch.cmake
index 602601f5..f311b2c5 100644
--- a/sample/cmake/FindOrFetch.cmake
+++ b/sample/cmake/FindOrFetch.cmake
@@ -118,6 +118,7 @@ macro(FindOrFetch)
         GIT_TAG ${_ARGS_GIT_TAG}
         GIT_SHALLOW FALSE
         PATCH_COMMAND ${_ARGS_PATCH_COMMAND}
+        UPDATE_DISCONNECTED TRUE
       )
       if(${_ARGS_EXCLUDE_FROM_ALL})
         FetchContent_GetProperties(${_ARGS_LIBRARY_NAME})
diff --git a/simulate/cmake/FindOrFetch.cmake b/simulate/cmake/FindOrFetch.cmake
index 602601f5..f311b2c5 100644
--- a/simulate/cmake/FindOrFetch.cmake
+++ b/simulate/cmake/FindOrFetch.cmake
@@ -118,6 +118,7 @@ macro(FindOrFetch)
         GIT_TAG ${_ARGS_GIT_TAG}
         GIT_SHALLOW FALSE
         PATCH_COMMAND ${_ARGS_PATCH_COMMAND}
+        UPDATE_DISCONNECTED TRUE
       )
       if(${_ARGS_EXCLUDE_FROM_ALL})
         FetchContent_GetProperties(${_ARGS_LIBRARY_NAME})