kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ExternalProject: Remove unused verify script logic 

The logic to re-run the download script will be moved elsewhere.
This commit is contained in:
Ruslan Baratov 2016-05-19 14:48:49 +03:00 committed by Brad King
parent e5409d1e0f
commit 33218f6a93
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/ExternalProject.cmake
View File

@ -935,30 +935,16 @@ message(STATUS \"downloading... done\")
endfunction() endfunction()
function(_ep_write_verifyfile_script script_filename LOCAL hash download_script) function(_ep_write_verifyfile_script script_filename LOCAL hash)
set(retries 0)
if("${hash}" MATCHES "${_ep_hash_regex}") if("${hash}" MATCHES "${_ep_hash_regex}")
set(algo "${CMAKE_MATCH_1}") set(algo "${CMAKE_MATCH_1}")
string(TOLOWER "${CMAKE_MATCH_2}" expect_value) string(TOLOWER "${CMAKE_MATCH_2}" expect_value)
set(script_content "set(expect_value \"${expect_value}\") set(script_content "set(expect_value \"${expect_value}\")
set(attempt 0)
set(succeeded 0) set(succeeded 0)
while(\${attempt} LESS ${retries} OR \${attempt} EQUAL ${retries} AND NOT \${succeeded})
file(${algo} \"\${file}\" actual_value) file(${algo} \"\${file}\" actual_value)
if(\"\${actual_value}\" STREQUAL \"\${expect_value}\") if(\"\${actual_value}\" STREQUAL \"\${expect_value}\")
set(succeeded 1) set(succeeded 1)
elseif(\${attempt} LESS ${retries})
message(STATUS \"${algo} hash of \${file}
does not match expected value
expected: \${expect_value}
actual: \${actual_value}
Retrying download.
\")
file(REMOVE \"\${file}\")
execute_process(COMMAND \${CMAKE_COMMAND} -P \"${download_script}\")
endif() endif()
math(EXPR attempt \"\${attempt} + 1\")
endwhile()
if(\${succeeded}) if(\${succeeded})
message(STATUS \"verifying file... done\") message(STATUS \"verifying file... done\")
@ -1899,7 +1885,6 @@ function(_ep_add_download_command name)
set(repository "external project URL") set(repository "external project URL")
set(module "${url}") set(module "${url}")
set(tag "${hash}") set(tag "${hash}")
set(download_script "")
configure_file( configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in" "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-urlinfo.txt" "${stamp_dir}/${name}-urlinfo.txt"
@ -1952,7 +1937,7 @@ function(_ep_add_download_command name)
endif () endif ()
set(comment "Performing download step (${steps}) for '${name}'") set(comment "Performing download step (${steps}) for '${name}'")
endif() endif()
_ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}" "${download_script}") _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}")
list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake
COMMAND) COMMAND)
if (NOT no_extract) if (NOT no_extract)