diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-01-27 15:52:23 -0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-27 15:52:23 -0800 |
| commit | 89751b450a161c1451937ee5338e599a51cf53a2 (patch) | |
| tree | 7a135d3bdd52660a313c4cdb833fcd0faefe710f /scripts/cmake | |
| parent | 42aa985bdd71af4927c751d6cfca81a63144261f (diff) | |
| download | vcpkg-89751b450a161c1451937ee5338e599a51cf53a2.tar.gz vcpkg-89751b450a161c1451937ee5338e599a51cf53a2.zip | |
[vcpkg_find_acquire_program] Include version in downloaded python MSI name to avoid conflicts when updating (#8774)
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 6f23d05b6..cb17ece21 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -110,7 +110,7 @@ function(vcpkg_find_acquire_program VAR) set(SUBDIR "python2") set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi") - set(ARCHIVE "python2.msi") + set(ARCHIVE "python-2.7.16.msi") set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254) else() set(PROGNAME python2) @@ -316,7 +316,7 @@ function(vcpkg_find_acquire_program VAR) file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() else() - get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT) + get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} LAST_EXT) string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION) if(ARCHIVE_EXTENSION STREQUAL ".msi") file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH) |