dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 06:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ExternalProject: support GIT_PROGRESS argument

Browse Source
This commit is contained in:
Ben Boeckel
2016-10-18 11:31:04 -04:00
parent 64aa29b7d6
commit e89fbfaf66
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/external-project-clone-progress.rst Normal file
View File

@@ -0,0 +1,5 @@
external-project-clone-progress
-------------------------------
* The :module:`ExternalProject` module gained the ``GIT_PROGRESS`` option to
force Git to show progress when cloning repositories.

15
Modules/ExternalProject.cmake
View File

@@ -68,6 +68,11 @@ Create custom targets to build projects in external trees
Tell Git to clone with ``--depth 1``. Use when ``GIT_TAG`` is not Tell Git to clone with ``--depth 1``. Use when ``GIT_TAG`` is not
specified or when it names a branch in order to download only the specified or when it names a branch in order to download only the
tip of the branch without the rest of its history. tip of the branch without the rest of its history.
``GIT_PROGRESS 1``
Tell Git to clone with ``--progress``. For large projects, the clone step
does not output anything which can make the build appear to have stalled.
This option forces Git to output progress information during the clone step
so that forward progress is indicated.
``HG_REPOSITORY <url>`` ``HG_REPOSITORY <url>``
URL of mercurial repo URL of mercurial repo
``HG_TAG <tag>`` ``HG_TAG <tag>``
@@ -509,7 +514,7 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED
"ExternalProject module." "ExternalProject module."
) )
function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow src_name work_dir gitclone_infofile gitclone_stampfile tls_verify) function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow git_progress src_name work_dir gitclone_infofile gitclone_stampfile tls_verify)
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10) if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
set(git_clone_shallow_options "--depth 1 --no-single-branch") set(git_clone_shallow_options "--depth 1 --no-single-branch")
else() else()
@@ -555,6 +560,11 @@ if(git_shallow)
list(APPEND git_clone_options ${git_clone_shallow_options}) list(APPEND git_clone_options ${git_clone_shallow_options})
endif() endif()
set(git_progress \"${git_progress}\")
if(git_progress)
list(APPEND git_clone_options --progress)
endif()
# try the clone 3 times incase there is an odd git clone issue # try the clone 3 times incase there is an odd git clone issue
set(error_code 1) set(error_code 1)
set(number_of_tries 0) set(number_of_tries 0)
@@ -1795,6 +1805,7 @@ function(_ep_add_download_command name)
set(tls_verify "${CMAKE_TLS_VERIFY}") set(tls_verify "${CMAKE_TLS_VERIFY}")
endif() endif()
get_property(git_shallow TARGET ${name} PROPERTY _EP_GIT_SHALLOW) get_property(git_shallow TARGET ${name} PROPERTY _EP_GIT_SHALLOW)
get_property(git_progress TARGET ${name} PROPERTY _EP_GIT_PROGRESS)
# For the download step, and the git clone operation, only the repository # For the download step, and the git clone operation, only the repository
# should be recorded in a configured RepositoryInfo file. If the repo # should be recorded in a configured RepositoryInfo file. If the repo
@@ -1819,7 +1830,7 @@ function(_ep_add_download_command name)
# The script will delete the source directory and then call git clone. # The script will delete the source directory and then call git clone.
# #
_ep_write_gitclone_script(${tmp_dir}/${name}-gitclone.cmake ${source_dir} _ep_write_gitclone_script(${tmp_dir}/${name}-gitclone.cmake ${source_dir}
${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${git_remote_name} "${git_submodules}" "${git_shallow}" ${src_name} ${work_dir} ${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${git_remote_name} "${git_submodules}" "${git_shallow}" "${git_progress}" ${src_name} ${work_dir}
${stamp_dir}/${name}-gitinfo.txt ${stamp_dir}/${name}-gitclone-lastrun.txt "${tls_verify}" ${stamp_dir}/${name}-gitinfo.txt ${stamp_dir}/${name}-gitclone-lastrun.txt "${tls_verify}"
) )
set(comment "Performing download step (git clone) for '${name}'") set(comment "Performing download step (git clone) for '${name}'")