mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

ExternalProject: Stop patch target from always appearing out-of-date

Browse Source 
The skip-update target is always considered out-of-date. The change in
7249ba9677 (ExternalProject: Enforce that patch depends on update, 2020-04-03)
made the patch target depend on skip-update, which in turn made it
always out of date too. The patch command should only be re-run if the download
needs to be performed again where updates are disconnected.

Fixes: #21086
This commit is contained in:
Craig Scott
2020-08-18 23:01:09 +10:00
parent acd15bf146
commit c0b7198ad9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/ExternalProject.cmake
View File

@@ -2801,9 +2801,9 @@ function(_ep_add_patch_command name)
_ep_get_update_disconnected(update_disconnected ${name})
if(update_disconnected)
set(update_dep skip-update)
set(patch_dep download)
else()
set(update_dep update)
set(patch_dep update)
endif()
set(__cmdQuoted)
@@ -2814,7 +2814,7 @@ function(_ep_add_patch_command name)
ExternalProject_Add_Step(${name} patch
COMMAND ${__cmdQuoted}
WORKING_DIRECTORY \${work_dir}
DEPENDEES download \${update_dep}
DEPENDEES \${patch_dep}
${log}
)"
)