diff options
| author | Matt Haynie <mrhaynie@live.com> | 2020-12-21 12:13:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 12:13:32 -0800 |
| commit | 730187bfd9c314c29148495d2c2527797fad5d43 (patch) | |
| tree | bd04de2a8adfc99346b243de31afc046f2f388b6 /scripts | |
| parent | f7e746dcae436ba29ed89c42b4dc0f788189a8de (diff) | |
| download | vcpkg-730187bfd9c314c29148495d2c2527797fad5d43.tar.gz vcpkg-730187bfd9c314c29148495d2c2527797fad5d43.zip | |
Write manifest "vcpkg install" output to stdout (#15187)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index d721bbafa..bc54afb70 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -392,7 +392,12 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-no-default-features") endif() - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" _VCPKG_MANIFEST_INSTALL_LOG) + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.18") + set(_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE) + else() + set(_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS) + endif() + execute_process( COMMAND "${_VCPKG_EXECUTABLE}" install --triplet "${VCPKG_TARGET_TRIPLET}" @@ -402,11 +407,15 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE "--x-install-root=${_VCPKG_INSTALLED_DIR}" ${_VCPKG_ADDITIONAL_MANIFEST_PARAMS} ${VCPKG_INSTALL_OPTIONS} - OUTPUT_FILE "${_VCPKG_MANIFEST_INSTALL_LOG}" - ERROR_FILE "${_VCPKG_MANIFEST_INSTALL_LOG}" + OUTPUT_VARIABLE _VCPKG_MANIFEST_INSTALL_LOGTEXT + ERROR_VARIABLE _VCPKG_MANIFEST_INSTALL_LOGTEXT RESULT_VARIABLE _VCPKG_INSTALL_RESULT + ${_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS} ) + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" _VCPKG_MANIFEST_INSTALL_LOGFILE) + file(WRITE "${_VCPKG_MANIFEST_INSTALL_LOGFILE}" "${_VCPKG_MANIFEST_INSTALL_LOGTEXT}") + if (_VCPKG_INSTALL_RESULT EQUAL 0) message(STATUS "Running vcpkg install - done") @@ -415,7 +424,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE "${_VCPKG_INSTALLED_DIR}/vcpkg/status") else() message(STATUS "Running vcpkg install - failed") - _vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${_VCPKG_MANIFEST_INSTALL_LOG}") + _vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${_VCPKG_MANIFEST_INSTALL_LOGFILE}") endif() endif() endif() |