Merge topic 'fetchcontent-patch-step-typo' into release-3.20

bd876f3849 FetchContent: Restore patch command support

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5822

Modules/ExternalProject.cmake

@@ -3897,7 +3897,7 @@ function(_ep_do_preconfigure_steps_now name)
 
   # Once any step has to run, all later steps have to be run too
   set(need_to_run FALSE)
-  foreach(step IN ITEMS download update parse)
+  foreach(step IN ITEMS download update patch)
     if(update_disconnected AND "${step}" STREQUAL "update")
       continue()
     endif()

Tests/RunCMake/FetchContent/MultiCommand-stdout.txt

@@ -0,0 +1,6 @@
+.* *download 1
+.* *download 2
+.* *update 1
+.* *update 2
+.* *patch 1
+.* *patch 2

Tests/RunCMake/FetchContent/MultiCommand.cmake

@@ -0,0 +1,18 @@
+include(FetchContent)
+
+# Verify COMMAND keyword is recognised after various *_COMMAND options
+FetchContent_Declare(multiCommand
+  DOWNLOAD_COMMAND  "${CMAKE_COMMAND}" -E echo "download 1"
+           COMMAND  "${CMAKE_COMMAND}" -E echo "download 2"
+  UPDATE_COMMAND    "${CMAKE_COMMAND}" -E echo "update 1"
+         COMMAND    "${CMAKE_COMMAND}" -E echo "update 2"
+  PATCH_COMMAND     "${CMAKE_COMMAND}" -E echo "patch 1"
+        COMMAND     "${CMAKE_COMMAND}" -E echo "patch 2"
+)
+
+# Force all steps to be re-run by removing timestamps, scripts, etc. from any
+# previous run
+file(REMOVE_RECURSE "${FETCHCONTENT_BASE_DIR}/multiCommand-subbuild")
+
+set(FETCHCONTENT_QUIET FALSE)
+FetchContent_MakeAvailable(multiCommand)

Tests/RunCMake/FetchContent/RunCMakeTest.cmake

@@ -2,6 +2,7 @@ include(RunCMake)
 
 unset(RunCMake_TEST_NO_CLEAN)
 
+run_cmake(MultiCommand)
 run_cmake(MissingDetails)
 run_cmake(DirectIgnoresDetails)
 run_cmake(FirstDetailsWin)