diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-11 20:54:25 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-11 20:54:25 -0800 |
| commit | f4622dce99378894b71c07e7fe989480981b5d56 (patch) | |
| tree | ebd8a9a893957236b5bcc60dbfb5523dd07a1b3e /scripts | |
| parent | 33404964a28145cf770aa9567b1a886ebc5fee9d (diff) | |
| download | vcpkg-f4622dce99378894b71c07e7fe989480981b5d56.tar.gz vcpkg-f4622dce99378894b71c07e7fe989480981b5d56.zip | |
[7zip] Also consider the system version, if available
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index df2f30af5..ab0cf1587 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -59,7 +59,7 @@ function(vcpkg_find_acquire_program VAR) set(HASH 23a26dc7e29979bec5dcd3bfcabf76397b93ace64f5d46f2254d6420158bac5eff1c1a8454e3427e7a2fe2c233c5f2cffc87b376772399e12e40b51be2c065f4) elseif(VAR MATCHES "7Z") set(PROGNAME 7z) - set(PATHS ${DOWNLOADS}/tools/7z/Files/7-Zip) + set(PATHS "C:/Program Files/7-Zip" ${DOWNLOADS}/tools/7z/Files/7-Zip) set(URL "http://7-zip.org/a/7z1604.msi") set(ARCHIVE "7z1604.msi") set(HASH 556f95f7566fe23704d136239e4cf5e2a26f939ab43b44145c91b70d031a088d553e5c21301f1242a2295dcde3143b356211f0108c68e65eef8572407618326d) |