diff options
| author | jgehw <44170764+jgehw@users.noreply.github.com> | 2020-09-09 19:36:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 10:36:58 -0700 |
| commit | 8b7e946c55507d491887bbfeb34453ff0c75c751 (patch) | |
| tree | 08bfa65706900acdc50fdb59fb9137ae2b555708 /scripts/cmake/vcpkg_execute_required_process.cmake | |
| parent | bff4dd9c944b9fbad40ec1a36d7c2365287ce0a6 (diff) | |
| download | vcpkg-8b7e946c55507d491887bbfeb34453ff0c75c751.tar.gz vcpkg-8b7e946c55507d491887bbfeb34453ff0c75c751.zip | |
[execute_process] Don't strip embedded semicolons (#12926)
Diffstat (limited to 'scripts/cmake/vcpkg_execute_required_process.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_execute_required_process.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index af5ab1e9e..b59675c35 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -36,7 +36,10 @@ ## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) ## * [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) ## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) + include(vcpkg_prettify_command) +include(vcpkg_execute_in_download_mode) + function(vcpkg_execute_required_process) cmake_parse_arguments(vcpkg_execute_required_process "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME;TIMEOUT" "COMMAND" ${ARGN}) set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-out.log") @@ -48,7 +51,6 @@ function(vcpkg_execute_required_process) set(TIMEOUT_PARAM "") endif() - set(execute_process_function execute_process) if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT vcpkg_execute_required_process_ALLOW_IN_DOWNLOAD_MODE) message(FATAL_ERROR [[ @@ -57,7 +59,7 @@ Halting portfile execution. ]]) endif() - _execute_process( + vcpkg_execute_in_download_mode( COMMAND ${vcpkg_execute_required_process_COMMAND} OUTPUT_FILE ${LOG_OUT} ERROR_FILE ${LOG_ERR} |