when pip is run, patch already applied, need --forward flag

jcschaff · jcschaff · commit 4bb3370e9fbb · 2025-01-20T10:43:02.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -241,7 +241,7 @@ else()
 			COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to libzippp"
 			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE_TO_PATCH} ${FILE_TO_PATCH}.bak
 			COMMAND ${CMAKE_COMMAND} -E touch ${FILE_TO_PATCH}
-			COMMAND patch ${FILE_TO_PATCH} < ${PATCH_FILE}
+			COMMAND patch --forward ${FILE_TO_PATCH} < ${PATCH_FILE}
 			DEPENDS ${PATCH_FILE}
 			COMMENT "Patching libzippp"
 	)

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ else()`
`241`	`241`	`COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to libzippp"`
`242`	`242`	`COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE_TO_PATCH} ${FILE_TO_PATCH}.bak`
`243`	`243`	`COMMAND ${CMAKE_COMMAND} -E touch ${FILE_TO_PATCH}`
`244`		`- COMMAND patch ${FILE_TO_PATCH} < ${PATCH_FILE}`
	`244`	`+ COMMAND patch --forward ${FILE_TO_PATCH} < ${PATCH_FILE}`
`245`	`245`	`DEPENDS ${PATCH_FILE}`
`246`	`246`	`COMMENT "Patching libzippp"`
`247`	`247`	`)`