summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-22 13:12:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-09-22 13:12:50 (GMT)
commit5eaa3e90255c8ff8a54e300dd336e0b09f75a2d3 (patch)
tree2ce572a902822906561d0b0c11903a3ad531a5d0 /Modules
parent82c8a3b01abd734c377588f048fb0b664cda46c8 (diff)
parent30a94eecdb5c580d83a224848b78d186643e8105 (diff)
downloadCMake-5eaa3e90255c8ff8a54e300dd336e0b09f75a2d3.zip
CMake-5eaa3e90255c8ff8a54e300dd336e0b09f75a2d3.tar.gz
CMake-5eaa3e90255c8ff8a54e300dd336e0b09f75a2d3.tar.bz2
Merge topic 'ExternalProject-retry'
30a94eec ExternalProject: Fix download retry logic
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake6
1 files changed, 0 insertions, 6 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f8c996e..9a78484 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)