diff options
| author | Craig Scott <craig.scott@crascit.com> | 2024-07-27 22:27:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-27 22:28:18 (GMT) |
| commit | 51b5d9f464c8f1a5a62c26f40cab553d115b991a (patch) | |
| tree | 4eaeb93c2986b55860a5a0d5fd3748da1d7953e4 | |
| parent | aad3ee074b1a0025247ea9cb0df9bff2417f5042 (diff) | |
| parent | 5df592ce31cbcf278e9742552f36ba2a9a46c3b7 (diff) | |
| download | CMake-51b5d9f464c8f1a5a62c26f40cab553d115b991a.zip CMake-51b5d9f464c8f1a5a62c26f40cab553d115b991a.tar.gz CMake-51b5d9f464c8f1a5a62c26f40cab553d115b991a.tar.bz2 | |
Merge topic 'fetchcontent-updates-disconnected' into release-3.30
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Silver Zachara <silver.zachara@gmail.com>
Merge-request: !9685
| -rw-r--r-- | Modules/ExternalProject/shared_internal_commands.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Modules/ExternalProject/shared_internal_commands.cmake b/Modules/ExternalProject/shared_internal_commands.cmake index acd97f1..a709670 100644 --- a/Modules/ExternalProject/shared_internal_commands.cmake +++ b/Modules/ExternalProject/shared_internal_commands.cmake @@ -1394,7 +1394,7 @@ hash=${hash} DEPENDS \${depends} DEPENDEES mkdir ${log} - ${uses_terminal} + ${uses_terminal} )" ) endfunction() @@ -1535,6 +1535,12 @@ function(_ep_add_update_command name) set(comment "Performing update step for '${name}'") set(comment_disconnected "Performing disconnected update step for '${name}'") + if(update_disconnected) + set(can_fetch_default NO) + else() + set(can_fetch_default YES) + endif() + set(git_tag "${_EP_GIT_TAG}") if(NOT git_tag) set(git_tag "master") @@ -1602,11 +1608,6 @@ function(_ep_add_update_command name) set(always 1) if(arg_SCRIPT_FILE) - if(update_disconnected) - set(can_fetch_default NO) - else() - set(can_fetch_default YES) - endif() set(step_script_contents "include(\"${update_script}\")") endif() @@ -1719,7 +1720,7 @@ Update to Mercurial >= 2.1.1. DEPENDEES download DEPENDS \${file_deps} ${log} - ${uses_terminal} + ${uses_terminal} )" ) if(update_disconnected) @@ -1740,7 +1741,7 @@ Update to Mercurial >= 2.1.1. DEPENDEES download DEPENDS \${file_deps} ${log} - ${uses_terminal} + ${uses_terminal} )" ) endif() @@ -1831,7 +1832,7 @@ function(_ep_add_patch_command name) DEPENDEES update DEPENDS \${patch_info_file} ${log} - ${uses_terminal} + ${uses_terminal} )" ) @@ -1844,7 +1845,7 @@ function(_ep_add_patch_command name) DEPENDEES update_disconnected DEPENDS \${patch_info_file} ${log} - ${uses_terminal} + ${uses_terminal} )" ) endif() |