Merge topic 'ExternalProject-retry'

30a94eec ExternalProject: Fix download retry logic
This commit is contained in:
Brad King 2014-09-22 09:12:50 -04:00 committed by CMake Topic Stage
commit 5eaa3e9025
1 changed files with 0 additions and 6 deletions

View File

@ -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)