From 5df592ce31cbcf278e9742552f36ba2a9a46c3b7 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Fri, 26 Jul 2024 11:23:58 +1000 Subject: [PATCH] FetchContent: Ensure can_fetch_default is set early enough The can_fetch_default variable needs to be set before the call to _ep_write_gitupdate_script(). Move it to before that call and always set the variable, even if arg_SCRIPT_FILE is not set. This makes the generated git update script file easier to follow if someone tries to follow what it is doing or wants to investigate problems and run it manually. Fixes: #26164 --- .../ExternalProject/shared_internal_commands.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Modules/ExternalProject/shared_internal_commands.cmake b/Modules/ExternalProject/shared_internal_commands.cmake index ef0c6d97f2..a709670cfc 100644 --- a/Modules/ExternalProject/shared_internal_commands.cmake +++ b/Modules/ExternalProject/shared_internal_commands.cmake @@ -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()