3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 15:07:58 +08:00
Code Issues Projects Releases Wiki Activity

Write manifest "vcpkg install" output to stdout (#15187)

Browse Source
This commit is contained in:
Matt Haynie 2020-12-21 12:13:32 -08:00 committed by GitHub
parent f7e746dcae
commit 730187bfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/buildsystems/vcpkg.cmake
View File

@ -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()