From 30a94eecdb5c580d83a224848b78d186643e8105 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 13 Sep 2014 19:09:59 +0400 Subject: [PATCH] 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. --- Modules/ExternalProject.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 27026f3c5..f8cda3c1d 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)