diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-11-02 19:14:10 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-11-03 15:02:53 -0700 |
| commit | 76d4666f12cbce4a52123cc41d489dfa4ce4bbba (patch) | |
| tree | 566581810bae393da2ae510bdc0f99b83b0ebbc7 | |
| parent | dc7db2571399a97d6dacc4f12f81ee1fa204987d (diff) | |
| download | vcpkg-76d4666f12cbce4a52123cc41d489dfa4ce4bbba.tar.gz vcpkg-76d4666f12cbce4a52123cc41d489dfa4ce4bbba.zip | |
[vcpkg_acquire_msys] Use vcpkg_download_distfile()
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 830022906..80a30bf2b 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -70,14 +70,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) set(PATH_TO_ROOT ${TOOLPATH}/${TOOLSUBPATH}) if(NOT EXISTS "${TOOLPATH}/${STAMP}") + message(STATUS "Acquiring MSYS2...") - file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE} - EXPECTED_HASH SHA512=${HASH} + vcpkg_download_distfile(ARCHIVE_PATH + URLS ${URL} + FILENAME ${ARCHIVE} + SHA512 ${HASH} ) + file(REMOVE_RECURSE ${TOOLPATH}/${TOOLSUBPATH}) file(MAKE_DIRECTORY ${TOOLPATH}) execute_process( - COMMAND ${CMAKE_COMMAND} -E tar xzf ${DOWNLOADS}/${ARCHIVE} + COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH} WORKING_DIRECTORY ${TOOLPATH} ) execute_process( |