[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1138-g85ea1c7

[Brad King]

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  85ea1c7df41f35687dedce3a0e34513e190c28da (commit)
       via  7d35b550605596b441af65e96be320ab7d33acc1 (commit)
      from  74207af6bb3fa7a3e6be1ebd0d1a82e4fa8d82ae (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85ea1c7df41f35687dedce3a0e34513e190c28da
commit 85ea1c7df41f35687dedce3a0e34513e190c28da
Merge: 74207af 7d35b55
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 17 11:30:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 11:30:30 2014 -0400

    Merge topic 'ExternalProject-no-download-progress' into next
    
    7d35b550 ExternalProject: Add option to disable download progress (#14807)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d35b550605596b441af65e96be320ab7d33acc1
commit 7d35b550605596b441af65e96be320ab7d33acc1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 17 11:24:20 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 17 11:28:05 2014 -0400

    ExternalProject: Add option to disable download progress (#14807)
    
    Add a DOWNLOAD_NO_PROGRESS option to disable progress reports while
    downloading source tarballs.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 1e83163..8235dda 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -20,6 +20,7 @@
 #    [DOWNLOAD_NAME fname]       # File name to store (if not end of URL)
 #    [DOWNLOAD_DIR dir]          # Directory to store downloaded files
 #    [DOWNLOAD_COMMAND cmd...]   # Command to download source tree
+#    [DOWNLOAD_NO_PROGRESS 1]    # Disable download progress reports
 #    [CVS_REPOSITORY cvsroot]    # CVSROOT of CVS repository
 #    [CVS_MODULE mod]            # Module to checkout from CVS repo
 #    [CVS_TAG tag]               # Tag to checkout from CVS repo
@@ -515,7 +516,7 @@ endif()
 
 endfunction(_ep_write_gitupdate_script)
 
-function(_ep_write_downloadfile_script script_filename remote local timeout hash tls_verify tls_cainfo)
+function(_ep_write_downloadfile_script script_filename remote local timeout no_progress hash tls_verify tls_cainfo)
   if(timeout)
     set(timeout_args TIMEOUT ${timeout})
     set(timeout_msg "${timeout} seconds")
@@ -524,6 +525,12 @@ function(_ep_write_downloadfile_script script_filename remote local timeout hash
     set(timeout_msg "none")
   endif()
 
+  if(no_progress)
+    set(show_progress "")
+  else()
+    set(show_progress "SHOW_PROGRESS")
+  endif()
+
   if("${hash}" MATCHES "${_ep_hash_regex}")
     set(hash_args EXPECTED_HASH ${CMAKE_MATCH_1}=${CMAKE_MATCH_2})
   else()
@@ -563,7 +570,7 @@ ${tls_cainfo}
 file(DOWNLOAD
   \"${remote}\"
   \"${local}\"
-  SHOW_PROGRESS
+  ${show_progress}
   ${hash_args}
   ${timeout_args}
   STATUS status
@@ -1443,10 +1450,11 @@ function(_ep_add_download_command name)
         string(REPLACE ";" "-" fname "${fname}")
         set(file ${download_dir}/${fname})
         get_property(timeout TARGET ${name} PROPERTY _EP_TIMEOUT)
+        get_property(no_progress TARGET ${name} PROPERTY _EP_DOWNLOAD_NO_PROGRESS)
         get_property(tls_verify TARGET ${name} PROPERTY _EP_TLS_VERIFY)
         get_property(tls_cainfo TARGET ${name} PROPERTY _EP_TLS_CAINFO)
         set(download_script "${stamp_dir}/download-${name}.cmake")
-        _ep_write_downloadfile_script("${download_script}" "${url}" "${file}" "${timeout}" "${hash}" "${tls_verify}" "${tls_cainfo}")
+        _ep_write_downloadfile_script("${download_script}" "${url}" "${file}" "${timeout}" "${no_progress}" "${hash}" "${tls_verify}" "${tls_cainfo}")
         set(cmd ${CMAKE_COMMAND} -P "${download_script}"
           COMMAND)
         set(retries 3)
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index d9344ec..0ed5561 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -98,6 +98,7 @@ ExternalProject_Add(${proj}
   CVS_TAG ""
   DEPENDS "MinimalNoOpProject" NonExternalProjectTarget
   DOWNLOAD_COMMAND ""
+  DOWNLOAD_NO_PROGRESS 1
   INSTALL_COMMAND ""
   PATCH_COMMAND ""
   STEP_TARGETS install update

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake        |   14 +++++++++++---
 Tests/ExternalProject/CMakeLists.txt |    1 +
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake