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

FetchContent: Ensure can_fetch_default is set early enough

Browse Source 
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
This commit is contained in:
Craig Scott
2024-07-26 11:23:58 +10:00
parent c233c51cb9
commit 5df592ce31
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/ExternalProject/shared_internal_commands.cmake
View File

@@ -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()