summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-10 16:29:21 (GMT)
committerBrad King <brad.king@kitware.com>2014-11-10 16:29:21 (GMT)
commit41b4fb997bdaff06c24221469bc5954cfff0fca1 (patch)
tree6b73222bed32f68c45522aac6dfa656d7550e152
parente9371739dd907e0309fbaa034e583efb54f100dd (diff)
parentee7405a6dbcc780c9ce720f20cbb25dde5f1b7f8 (diff)
downloadCMake-41b4fb997bdaff06c24221469bc5954cfff0fca1.zip
CMake-41b4fb997bdaff06c24221469bc5954cfff0fca1.tar.gz
CMake-41b4fb997bdaff06c24221469bc5954cfff0fca1.tar.bz2
Merge branch 'ExternalProject-check-hash-before-download' into release
-rw-r--r--Modules/ExternalProject.cmake15
1 files changed, 14 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 1e9a98a..8832950 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -628,6 +628,19 @@ function(_ep_write_downloadfile_script script_filename remote local timeout no_p
set(show_progress "SHOW_PROGRESS")
endif()
+ if("${hash}" MATCHES "${_ep_hash_regex}")
+ string(CONCAT hash_check
+ "if(EXISTS \"${local}\")\n"
+ " file(\"${CMAKE_MATCH_1}\" \"${local}\" hash_value)\n"
+ " if(\"x\${hash_value}\" STREQUAL \"x${CMAKE_MATCH_2}\")\n"
+ " return()\n"
+ " endif()\n"
+ "endif()\n"
+ )
+ else()
+ set(hash_check "")
+ endif()
+
# check for curl globals in the project
if(DEFINED CMAKE_TLS_VERIFY)
set(tls_verify "set(CMAKE_TLS_VERIFY ${CMAKE_TLS_VERIFY})")
@@ -651,7 +664,7 @@ function(_ep_write_downloadfile_script script_filename remote local timeout no_p
endif()
file(WRITE ${script_filename}
-"message(STATUS \"downloading...
+"${hash_check}message(STATUS \"downloading...
src='${remote}'
dst='${local}'
timeout='${timeout_msg}'\")