diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-08-28 11:47:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 11:47:17 -0700 |
| commit | 65d4bc146bf7c1c21989b680497b1f6f9a09c967 (patch) | |
| tree | 31e564677ff7ae3f065c3bd3d7448ba959edb524 /scripts/cmake/vcpkg_find_acquire_program.cmake | |
| parent | fc135e20eae801bcd6a20ddb8fba677f61dba5a5 (diff) | |
| download | vcpkg-65d4bc146bf7c1c21989b680497b1f6f9a09c967.tar.gz vcpkg-65d4bc146bf7c1c21989b680497b1f6f9a09c967.zip | |
[vcpkg install] Enable Download Mode (#7797)
* [portfile functions] Override execute_process() to accept ALLOW_IN_DOWNLOAD_MODE option
* [vcpkg install] Set VCPKG_DOWNLOAD_MODE when using --only-downloads option
* [vcpkg_find_acquire_program] Allow in Download Mode
* Don't stop when build fails for a package
* Download sources for all packages in dependency graph
* Improve output messages
* Enable acquiring MSYS packages in download mode
* Documentation
* Update documentation
* execute_process() always fails on Download Mode
* Regenerate docs and fix formatting
* Run clang-format
* Use _execute_process on vcpkg_from_<source> helpers
Diffstat (limited to 'scripts/cmake/vcpkg_find_acquire_program.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index fed016c7b..aa8a70026 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -302,12 +302,12 @@ function(vcpkg_find_acquire_program VAR) if(ARCHIVE_EXTENSION STREQUAL ".msi") file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH) file(TO_NATIVE_PATH "${PROG_PATH_SUBDIR}" DESTINATION_NATIVE_PATH) - execute_process( + _execute_process( COMMAND msiexec /a ${ARCHIVE_NATIVE_PATH} /qn TARGETDIR=${DESTINATION_NATIVE_PATH} WORKING_DIRECTORY ${DOWNLOADS} ) else() - execute_process( + _execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH} WORKING_DIRECTORY ${PROG_PATH_SUBDIR} ) @@ -316,6 +316,7 @@ function(vcpkg_find_acquire_program VAR) if(DEFINED POST_INSTALL_COMMAND) vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE COMMAND ${POST_INSTALL_COMMAND} WORKING_DIRECTORY ${PROG_PATH_SUBDIR} LOGNAME ${VAR}-tool-post-install |