Fix patch file dependencies in ament_cmake_vendor_package (#520) (#549)

When patch files are changed, re-download the sources to get a clean slate to re-apply the changed patch files. Signed-off-by: Scott K Logan <[email protected]> Co-authored-by: Scott K Logan <[email protected]>
ament · Sep 6, 2024 · d87f6f0 · d87f6f0
1 parent 2cb9580
commit d87f6f0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ament_cmake_vendor_package/cmake/ament_vendor.cmake b/ament_cmake_vendor_package/cmake/ament_vendor.cmake
@@ -269,6 +269,8 @@ function(_ament_vendor TARGET_NAME VCS_TYPE VCS_URL VCS_VERSION PATCHES CMAKE_AR
     find_program(vcs_EXECUTABLE vcs REQUIRED)
     list(
       APPEND EXTERNALPROJECT_ARGS
+      DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E rm -rf <SOURCE_DIR> &&
+      DOWNLOAD_COMMAND "${CMAKE_COMMAND}" -E make_directory <SOURCE_DIR> &&
       DOWNLOAD_COMMAND "${vcs_EXECUTABLE}" import . --input "${REPOS_FILE}" --shallow --recursive --force
       SOURCE_SUBDIR ${SOURCE_SUBDIR}
     )
@@ -288,7 +290,7 @@ function(_ament_vendor TARGET_NAME VCS_TYPE VCS_URL VCS_VERSION PATCHES CMAKE_AR
 
   externalproject_add_stepdependencies(${TARGET_NAME} download ${REPOS_FILE})
   if(PATCH_FILES)
-    externalproject_add_stepdependencies(${TARGET_NAME} patch ${PATCH_FILES})
+    externalproject_add_stepdependencies(${TARGET_NAME} download ${PATCH_FILES})
   endif()
   if(VCS_TYPE STREQUAL "path")
     file(GLOB_RECURSE SOURCE_FILES