mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ep-patch-skip-update-dep'

Browse Source 
715324742f ExternalProject: Stop configure target from always appearing out-of-date
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5136
This commit is contained in:
Brad King
2020-08-19 15:39:56 +00:00
committed by Kitware Robot
parent 296e2aa818 715324742f
commit db160604f7
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Modules/ExternalProject.cmake
View File

@@ -747,7 +747,7 @@ control needed to implement such step-level capabilities.
``<name>`` is the same as the name passed to the original call to
:command:`ExternalProject_Add`. The specified ``<step>`` must not be one of
the pre-defined steps (``mkdir``, ``download``, ``update``, ``skip-update``,
the pre-defined steps (``mkdir``, ``download``, ``update``,
``patch``, ``configure``, ``build``, ``install`` or ``test``). The supported
options are:
@@ -2762,21 +2762,6 @@ Update to Mercurial >= 2.1.1.
)"
)
if(update_disconnected)
_ep_get_step_stampfile(${name} skip-update skip-update_stamp_file)
string(REPLACE "Performing" "Skipping" comment "${comment}")
ExternalProject_Add_Step(${name} skip-update
COMMENT ${comment}
ALWAYS ${always}
EXCLUDE_FROM_MAIN 1
WORKING_DIRECTORY ${work_dir}
DEPENDEES download
${log}
${uses_terminal}
)
set_property(SOURCE ${skip-update_stamp_file} PROPERTY SYMBOLIC 1)
endif()
endfunction()
@@ -2801,9 +2786,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 +2799,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}
)"
)
@@ -2970,13 +2955,6 @@ function(_ep_add_configure_command name)
set(uses_terminal "")
endif()
_ep_get_update_disconnected(update_disconnected ${name})
if(update_disconnected)
set(update_dep skip-update)
else()
set(update_dep update)
endif()
set(__cmdQuoted)
foreach(__item IN LISTS cmd)
string(APPEND __cmdQuoted " [==[${__item}]==]")
@@ -2985,7 +2963,7 @@ function(_ep_add_configure_command name)
ExternalProject_Add_Step(${name} configure
COMMAND ${__cmdQuoted}
WORKING_DIRECTORY \${binary_dir}
DEPENDEES \${update_dep} patch
DEPENDEES patch
DEPENDS \${file_deps}
${log}
${uses_terminal}