Skip to content

Commit

Permalink
Fix patch file dependencies in ament_cmake_vendor_package (#520)
Browse files Browse the repository at this point in the history
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 <logans@cottsay.net>
  • Loading branch information
cottsay authored Mar 13, 2024
1 parent c1cf011 commit f44a937
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ament_cmake_vendor_package/cmake/ament_vendor.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand All @@ -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
Expand Down

0 comments on commit f44a937

Please sign in to comment.