diff options
| author | Leonid Pospelov <pospelovlm@yandex.ru> | 2019-07-01 22:30:24 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-07-01 13:30:24 -0700 |
| commit | b26cb1a041177ab113c723d89a4ef2af5614a9e5 (patch) | |
| tree | 969f6e1da79c2610a8ba540ea00dda31c7a78c52 /scripts/cmake/vcpkg_execute_required_process.cmake | |
| parent | 77cfd20b83e71a0c513658e7c4d049d4039905af (diff) | |
| download | vcpkg-b26cb1a041177ab113c723d89a4ef2af5614a9e5.tar.gz vcpkg-b26cb1a041177ab113c723d89a4ef2af5614a9e5.zip | |
[vcpkg] Use spaces instead of semicolons in the output (#7080)
* Use spaces instead of semicolons in the output
* Add prettify_command macro
* Move pretty_command macro to a separate file
Diffstat (limited to 'scripts/cmake/vcpkg_execute_required_process.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_execute_required_process.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index 2e9ba7058..e65d1970a 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -28,6 +28,7 @@ ## * [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) function(vcpkg_execute_required_process) cmake_parse_arguments(vcpkg_execute_required_process "" "WORKING_DIRECTORY;LOGNAME" "COMMAND" ${ARGN}) set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-out.log") @@ -53,8 +54,9 @@ function(vcpkg_execute_required_process) file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") endforeach() + vcpkg_prettify_command(vcpkg_execute_required_process_COMMAND vcpkg_execute_required_process_COMMAND_PRETTY) message(FATAL_ERROR - " Command failed: ${vcpkg_execute_required_process_COMMAND}\n" + " Command failed: ${vcpkg_execute_required_process_COMMAND_PRETTY}\n" " Working Directory: ${vcpkg_execute_required_process_WORKING_DIRECTORY}\n" " Error code: ${error_code}\n" " See logs for more information:\n" |