[Cmake-commits] CMake branch, next, updated. v3.0.2-5321-g82e2ef8

[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  82e2ef88654701fcad9b2c0143d1150b1e243429 (commit)
       via  30a94eecdb5c580d83a224848b78d186643e8105 (commit)
       via  2770b19f4c444c1b7506dc45e7629b112164617d (commit)
       via  453f20d89381d8d5c2e7afb91559c754dc03910e (commit)
      from  5cbabd26b09d3798015b99288e92aef646154822 (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=82e2ef88654701fcad9b2c0143d1150b1e243429
commit 82e2ef88654701fcad9b2c0143d1150b1e243429
Merge: 5cbabd2 30a94ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 15 09:09:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 15 09:09:36 2014 -0400

    Merge topic 'ExternalProject-retry' into next
    
    30a94eec ExternalProject: Fix download retry logic
    2770b19f CMake Nightly Date Stamp
    453f20d8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30a94eecdb5c580d83a224848b78d186643e8105
commit 30a94eecdb5c580d83a224848b78d186643e8105
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Sat Sep 13 19:09:59 2014 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 15 09:08:33 2014 -0400

    ExternalProject: Fix download retry logic
    
    Do not check file's hash in download script.  If hash will not match
    command ``file(DOWNLOAD ...)`` will fail with FATAL_ERROR, ``cmake -P``
    will exit with unsuccessful code, and the build will stop.  Leave hash
    checking to the existing implementation in the verify step.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 27026f3..f8cda3c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -628,11 +628,6 @@ function(_ep_write_downloadfile_script script_filename remote local timeout no_p
     set(show_progress "SHOW_PROGRESS")
   endif()
 
-  if("${hash}" MATCHES "${_ep_hash_regex}")
-    set(hash_args EXPECTED_HASH ${CMAKE_MATCH_1}=${CMAKE_MATCH_2})
-  else()
-    set(hash_args "# no EXPECTED_HASH")
-  endif()
   # check for curl globals in the project
   if(DEFINED CMAKE_TLS_VERIFY)
     set(tls_verify "set(CMAKE_TLS_VERIFY ${CMAKE_TLS_VERIFY})")
@@ -668,7 +663,6 @@ file(DOWNLOAD
   \"${remote}\"
   \"${local}\"
   ${show_progress}
-  ${hash_args}
   ${timeout_args}
   STATUS status
   LOG log)

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

Summary of changes:
 Modules/ExternalProject.cmake |    6 ------
 Source/CMakeVersion.cmake     |    2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
CMake