Fix UPDATE_COMMAND <-> PATCH_COMMAND for zlib (#2740)

vrabaud · web-flow · commit 26e1b61cbb52 · 2025-04-02T14:45:33.000+02:00
diff --git a/cmake/Modules/LocalZlibpng.cmake b/cmake/Modules/LocalZlibpng.cmake
@@ -24,7 +24,8 @@ FetchContent_Declare(
     SOURCE_DIR "${ZLIB_SOURCE_DIR}" BINARY_DIR "${ZLIB_BINARY_DIR}"
     GIT_TAG "${AVIF_ZLIB_GIT_TAG}"
     GIT_SHALLOW ON
-    UPDATE_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_SOURCE_DIR}/ext/zlib.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_SOURCE_DIR}/ext/zlib.patch"
+    UPDATE_COMMAND ""
 )
 
 # Put the value of ZLIB_INCLUDE_DIR in the cache. This works around cmake behavior that has been updated by

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ FetchContent_Declare(`
`24`	`24`	`SOURCE_DIR "${ZLIB_SOURCE_DIR}" BINARY_DIR "${ZLIB_BINARY_DIR}"`
`25`	`25`	`GIT_TAG "${AVIF_ZLIB_GIT_TAG}"`
`26`	`26`	`GIT_SHALLOW ON`
`27`		`- UPDATE_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_SOURCE_DIR}/ext/zlib.patch"`
	`27`	`+ PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_SOURCE_DIR}/ext/zlib.patch"`
	`28`	`+ UPDATE_COMMAND ""`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`# Put the value of ZLIB_INCLUDE_DIR in the cache. This works around cmake behavior that has been updated by`