[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-622-g8554cb7
Brad King
brad.king at kitware.com
Wed Oct 19 09:09:50 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8554cb72c124ac87e63e3da1d23f9795c7b42f2e (commit)
via e89fbfaf6626b0693cc597ce4e705d87b8faf996 (commit)
via 64aa29b7d682c333653ee4720e07914396ec3da7 (commit)
from f05a7d0668b7d1f6e540e9478332eeff04090c23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8554cb72c124ac87e63e3da1d23f9795c7b42f2e
commit 8554cb72c124ac87e63e3da1d23f9795c7b42f2e
Merge: f05a7d0 e89fbfa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 19 09:09:49 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 19 09:09:49 2016 -0400
Merge topic 'external-project-clone-progress' into next
e89fbfaf ExternalProject: support GIT_PROGRESS argument
64aa29b7 ExternalProject: fix typo
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e89fbfaf6626b0693cc597ce4e705d87b8faf996
commit e89fbfaf6626b0693cc597ce4e705d87b8faf996
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 18 11:31:04 2016 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Oct 18 17:41:02 2016 -0400
ExternalProject: support GIT_PROGRESS argument
diff --git a/Help/release/dev/external-project-clone-progress.rst b/Help/release/dev/external-project-clone-progress.rst
new file mode 100644
index 0000000..766a1a3
--- /dev/null
+++ b/Help/release/dev/external-project-clone-progress.rst
@@ -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.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index a56f64c..9694563 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -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
specified or when it names a branch in order to download only the
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>``
URL of mercurial repo
``HG_TAG <tag>``
@@ -509,7 +514,7 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED
"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)
set(git_clone_shallow_options "--depth 1 --no-single-branch")
else()
@@ -555,6 +560,11 @@ if(git_shallow)
list(APPEND git_clone_options ${git_clone_shallow_options})
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
set(error_code 1)
set(number_of_tries 0)
@@ -1795,6 +1805,7 @@ function(_ep_add_download_command name)
set(tls_verify "${CMAKE_TLS_VERIFY}")
endif()
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
# 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.
#
_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}"
)
set(comment "Performing download step (git clone) for '${name}'")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64aa29b7d682c333653ee4720e07914396ec3da7
commit 64aa29b7d682c333653ee4720e07914396ec3da7
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 18 11:30:44 2016 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Oct 18 11:30:44 2016 -0400
ExternalProject: fix typo
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 4ba8537..a56f64c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -65,7 +65,7 @@ Create custom targets to build projects in external trees
``GIT_SUBMODULES <module>...``
Git submodules that shall be updated, all if empty
``GIT_SHALLOW 1``
- 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
tip of the branch without the rest of its history.
``HG_REPOSITORY <url>``
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/external-project-clone-progress.rst | 5 +++++
Modules/ExternalProject.cmake | 17 ++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 Help/release/dev/external-project-clone-progress.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list