yuzu/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg synced 2024-11-21 16:09:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove msiexec dependency by adding using vcpkg.exe to unpack 7z.exe (#41604)

Browse source 
Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local>
This commit is contained in:
Javier Matos Denizac 2024-11-04 11:24:25 -08:00 committed by GitHub
parent 335a153de3
commit 2964ea8e32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/azure-pipelines/azure-pipelines.yml
View file

@ -8,7 +8,7 @@ parameters:
- name: vcpkgToolSha - name: vcpkgToolSha
displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
type: string type: string
default: 'use default' default: 'use default'
- name: tripletPattern - name: tripletPattern
displayName: 'Enable triplets which contain this substring' displayName: 'Enable triplets which contain this substring'
type: string type: string

6
scripts/cmake/vcpkg_extract_archive.cmake
View file

@ -34,12 +34,8 @@ function(vcpkg_extract_archive)
WORKING_DIRECTORY "${archive_directory}" WORKING_DIRECTORY "${archive_directory}"
) )
elseif("${archive_extension}" MATCHES [[\.7z\.exe$]]) elseif("${archive_extension}" MATCHES [[\.7z\.exe$]])
vcpkg_find_acquire_program(7Z)
vcpkg_execute_in_download_mode( vcpkg_execute_in_download_mode(
COMMAND ${7Z} x COMMAND "$ENV{VCPKG_COMMAND}" z-extract "${arg_ARCHIVE}" "${arg_DESTINATION}"
"${arg_ARCHIVE}"
"-o${arg_DESTINATION}"
-y -bso0 -bsp0
WORKING_DIRECTORY "${arg_DESTINATION}" WORKING_DIRECTORY "${arg_DESTINATION}"
) )
else() else()

10
scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
View file

@ -1,9 +1,9 @@
set(program_name 7z) set(program_name 7z)
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(tool_subdirectory "24.08") set(tool_subdirectory "24.08")
set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path set(paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/7z2408/SourceDir/Files/7-Zip")
list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip") set(download_urls "https://github.com/ip7z/7zip/releases/download/24.08/7z2408.exe")
set(download_urls "https://github.com/ip7z/7zip/releases/download/24.08/7z2408.msi" "https://7-zip.org/a/7z2408.msi") set(download_filename "7z2408.7z.exe")
set(download_filename "7z2408.msi") set(search_names "7z.exe")
set(download_sha512 0bc88c99ad921a6f828d9ed9b8391510d1d0c2f8ecb7ad2921838c97c20f215e2ab03198009d159e2d1859bb20f157010f492288ce61c86544df06742cebbc34) set(download_sha512 7f6c46c780fcb5fc10cc5405221179ddecbbb871c578ca3d9e3a74141271b383bd83e8f9d75c98d7e9d406e9b935d52a6b04913d654169e0b30f0719225e7dd9)
endif() endif()