Mercurial > hg > orthanc
diff Resources/CMake/DownloadPackage.cmake @ 553:27d32fc6209a
simplifications to cmake, use a digest of boost 1.54.0 thanks bcp
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 17 Sep 2013 15:06:16 +0200 |
parents | 5f6d75cd4b46 |
children | 49945044b06d |
line wrap: on
line diff
--- a/Resources/CMake/DownloadPackage.cmake Tue Sep 17 14:20:48 2013 +0200 +++ b/Resources/CMake/DownloadPackage.cmake Tue Sep 17 15:06:16 2013 +0200 @@ -10,20 +10,16 @@ endmacro() -macro(DownloadPackage MD5 Url TargetDirectory PreloadedVariable UncompressArguments) +macro(DownloadPackage MD5 Url TargetDirectory) if (NOT IS_DIRECTORY "${TargetDirectory}") GetUrlFilename(TMP_FILENAME "${Url}") - if ("${PreloadedVariable}" STREQUAL "") - set(TMP_PATH "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${TMP_FILENAME}") - if (NOT EXISTS "${TMP_PATH}") - message("Downloading ${Url}") - file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS EXPECTED_MD5 "${MD5}") - else() - message("Using local copy of ${Url}") - endif() + + set(TMP_PATH "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${TMP_FILENAME}") + if (NOT EXISTS "${TMP_PATH}") + message("Downloading ${Url}") + file(DOWNLOAD "${Url}" "${TMP_PATH}" SHOW_PROGRESS EXPECTED_MD5 "${MD5}") else() - message("Using preloaded archive ${PreloadedVariable} for ${Url}") - set(TMP_PATH "${PreloadedVariable}") + message("Using local copy of ${Url}") endif() GetUrlExtension(TMP_EXTENSION "${Url}") @@ -48,37 +44,18 @@ message(FATAL_ERROR "Error while running the uncompression tool") endif() - set(ARGS ${UncompressArguments}) - SEPARATE_ARGUMENTS(ARGS) - list(LENGTH ARGS TMP_LENGTH) - if ("${TMP_EXTENSION}" STREQUAL "tgz") string(REGEX REPLACE ".tgz$" ".tar" TMP_FILENAME2 "${TMP_FILENAME}") else() string(REGEX REPLACE ".gz$" "" TMP_FILENAME2 "${TMP_FILENAME}") endif() - if (TMP_LENGTH EQUAL 0) - execute_process( - COMMAND ${ZIP_EXECUTABLE} x -y ${TMP_FILENAME2} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Failure - OUTPUT_QUIET - ) - else() - foreach(SUBDIR ${ARGS}) - execute_process( - COMMAND ${ZIP_EXECUTABLE} x -y "-i!${SUBDIR}" "${TMP_FILENAME2}" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Failure - OUTPUT_QUIET - ) - - if (Failure) - message(FATAL_ERROR "Error while running the uncompression tool") - endif() - endforeach() - endif() + execute_process( + COMMAND ${ZIP_EXECUTABLE} x -y ${TMP_FILENAME2} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + OUTPUT_QUIET + ) elseif ("${TMP_EXTENSION}" STREQUAL "zip") execute_process( COMMAND ${ZIP_EXECUTABLE} x -y ${TMP_PATH} @@ -93,20 +70,20 @@ else() if ("${TMP_EXTENSION}" STREQUAL "zip") execute_process( - COMMAND sh -c "unzip -q ${TMP_PATH} ${UncompressArguments}" + COMMAND sh -c "unzip -q ${TMP_PATH}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) elseif (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz")) - #message("tar xvfz ${TMP_PATH} ${UncompressArguments}") + #message("tar xvfz ${TMP_PATH}") execute_process( - COMMAND sh -c "tar xfz ${TMP_PATH} ${UncompressArguments}" + COMMAND sh -c "tar xfz ${TMP_PATH}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) elseif ("${TMP_EXTENSION}" STREQUAL "bz2") execute_process( - COMMAND sh -c "tar xfj ${TMP_PATH} ${UncompressArguments}" + COMMAND sh -c "tar xfj ${TMP_PATH}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -124,4 +101,3 @@ endif() endif() endmacro() -