diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-01 17:12:59 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-01 17:12:59 -0700 |
| commit | ebc875df58a9441e30fab54e7ba84418e6bf8238 (patch) | |
| tree | 2fc0e179b9ad7e03d0ebfabd01153fa74643adf6 /scripts | |
| parent | ef3acf597aa3d7373b5ae708037cd74478daf648 (diff) | |
| download | vcpkg-ebc875df58a9441e30fab54e7ba84418e6bf8238.tar.gz vcpkg-ebc875df58a9441e30fab54e7ba84418e6bf8238.zip | |
[openssl][vcpkg_find_acquire_program] Use msys to provide perl for vcpkg_find_acquire_program. Revert openssl to use this instead of msys directly.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index fef62da53..4efe756ee 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -33,6 +33,7 @@ ## * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) ## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) ## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) +include(vcpkg_acquire_msys) function(vcpkg_find_acquire_program VAR) if(${VAR} AND NOT ${VAR} MATCHES "-NOTFOUND") return() @@ -46,11 +47,14 @@ function(vcpkg_find_acquire_program VAR) vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT) if(VAR MATCHES "PERL") - set(PROGNAME perl) - set(PATHS ${DOWNLOADS}/tools/perl/perl/bin) - set(URL "http://strawberryperl.com/download/5.24.1.1/strawberry-perl-5.24.1.1-32bit-portable.zip") - set(ARCHIVE "strawberry-perl-5.24.1.1-32bit-portable.zip") - set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26) + vcpkg_acquire_msys(MSYS_ROOT) + vcpkg_execute_required_process( + COMMAND ${MSYS_ROOT}/usr/bin/bash.exe --noprofile --norc -c 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed perl' + WORKING_DIRECTORY ${MSYS_ROOT} + LOGNAME acquire-perl-${TARGET_TRIPLET} + ) + set(PERL "${MSYS_ROOT}/usr/bin/perl.exe" PARENT_SCOPE) + return() elseif(VAR MATCHES "NASM") set(PROGNAME nasm) set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02) |