diff options
| author | Ruslan Baratov <ruslan_baratov@yahoo.com> | 2014-09-13 15:09:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-15 13:08:33 (GMT) |
| commit | 30a94eecdb5c580d83a224848b78d186643e8105 (patch) | |
| tree | d20c9e8a536d1bc5afbed42e1ec7706534617f9b | |
| parent | 2770b19f4c444c1b7506dc45e7629b112164617d (diff) | |
| download | CMake-30a94eecdb5c580d83a224848b78d186643e8105.zip CMake-30a94eecdb5c580d83a224848b78d186643e8105.tar.gz CMake-30a94eecdb5c580d83a224848b78d186643e8105.tar.bz2 | |
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.
| -rw-r--r-- | Modules/ExternalProject.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
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) |