# HG changeset patch # User Sebastien Jodogne # Date 1538492736 -7200 # Node ID ebb3f2aa5f23b5f21d7ff275ed13cb9b9fc46899 # Parent 52b017d22a4f614aaac218528e06401b16743372# Parent d4f44a8028a10d053922bad873726a2dadfc18fe merge diff -r 52b017d22a4f -r ebb3f2aa5f23 Resources/CMake/DownloadPackage.cmake --- a/Resources/CMake/DownloadPackage.cmake Tue Oct 02 17:05:07 2018 +0200 +++ b/Resources/CMake/DownloadPackage.cmake Tue Oct 02 17:05:36 2018 +0200 @@ -73,18 +73,23 @@ # user know." # https://code.google.com/p/orthanc/issues/detail?id=6 if (NOT STATIC_BUILD AND NOT ALLOW_DOWNLOADS) - message(FATAL_ERROR "CMake is not allowed to download from Internet. Please set the ALLOW_DOWNLOADS option to ON") + message(FATAL_ERROR "CMake is not allowed to download from Internet. Please set the ALLOW_DOWNLOADS option to ON") endif() - file(DOWNLOAD "${Url}" "${TMP_PATH}" - SHOW_PROGRESS EXPECTED_MD5 "${MD5}" - TIMEOUT 60 INACTIVITY_TIMEOUT 60) + if (MD5) + file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS TIMEOUT 60 INACTIVITY_TIMEOUT 60 EXPECTED_MD5 "${MD5}") + else() + file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS TIMEOUT 60 INACTIVITY_TIMEOUT 60) + endif() + else() message("Using local copy of ${Url}") - file(MD5 ${TMP_PATH} ActualMD5) - if (NOT "${ActualMD5}" STREQUAL "${MD5}") - message(FATAL_ERROR "The MD5 hash of a previously download file is invalid: ${TMP_PATH}") + if (MD5) + file(MD5 ${TMP_PATH} ActualMD5) + if (NOT "${ActualMD5}" STREQUAL "${MD5}") + message(FATAL_ERROR "The MD5 hash of a previously download file is invalid: ${TMP_PATH}") + endif() endif() endif()