diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-31 11:50:32 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-31 11:50:50 -0800 |
| commit | 1f6f27a5480a02434614cc48aed5178a9e69bb4e (patch) | |
| tree | 34087d1c24a83ec02c9b1ddb2814a7090dc04b53 | |
| parent | 76c28ad78e728cceb9dd0d5f6bec5c3454d74d4d (diff) | |
| download | vcpkg-1f6f27a5480a02434614cc48aed5178a9e69bb4e.tar.gz vcpkg-1f6f27a5480a02434614cc48aed5178a9e69bb4e.zip | |
[vcpkg-from-bitbucket] Fix HEAD builds. Fixes #2696.
| -rw-r--r-- | scripts/cmake/vcpkg_from_bitbucket.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake index 26600f013..a12d86b43 100644 --- a/scripts/cmake/vcpkg_from_bitbucket.cmake +++ b/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -130,7 +130,8 @@ function(vcpkg_from_bitbucket) # The following is for --head scenarios set(URL "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_HEAD_REF}.tar.gz") - set(downloaded_file_path "${DOWNLOADS}/${ORG_NAME}-${REPO_NAME}-${_vdud_HEAD_REF}.tar.gz") + set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${_vdud_HEAD_REF}.tar.gz") + set(downloaded_file_path "${DOWNLOADS}/${downloaded_file_name}") if(_VCPKG_NO_DOWNLOADS) if(NOT EXISTS ${downloaded_file_path} OR NOT EXISTS ${downloaded_file_path}.version) @@ -150,17 +151,17 @@ function(vcpkg_from_bitbucket) endif() # Try to download the file and version information from bitbucket. - set(_VCPKG_INTERNAL_NO_HASH_CHECK "TRUE") vcpkg_download_distfile(ARCHIVE_VERSION URLS "https://api.bitbucket.com/2.0/repositories/${ORG_NAME}/${REPO_NAME}/refs/branches/${_vdud_HEAD_REF}" - FILENAME ${downloaded_file_name}.version + FILENAME "${downloaded_file_name}.version" + SKIP_SHA512 ) vcpkg_download_distfile(ARCHIVE - URLS ${URL} - FILENAME ${downloaded_file_name} + URLS "${URL}" + FILENAME "${downloaded_file_name}" + SKIP_SHA512 ) - set(_VCPKG_INTERNAL_NO_HASH_CHECK "FALSE") endif() vcpkg_extract_source_archive_ex( |