From 4fff1e9cfaa7abae62f6464e429dc1877a1bfd2f Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Fri, 24 Dec 2021 02:20:24 +0100 Subject: [PATCH] Use global variable --- scripts/cmake/vcpkg_execute_build_process.cmake | 3 +-- scripts/cmake/vcpkg_execute_required_process.cmake | 3 +-- scripts/ports.cmake | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 8a930f532b0384..376aaf4f8b8ab1 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -71,7 +71,6 @@ function(vcpkg_execute_build_process) set(log_out "${log_prefix}-out.log") set(log_err "${log_prefix}-err.log") set(all_logs "${log_out}" "${log_err}") - set(log_collection "${CURRENT_BUILDTREES_DIR}/logs.txt") execute_process( COMMAND ${arg_COMMAND} @@ -151,7 +150,7 @@ function(vcpkg_execute_build_process) if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") - file(APPEND "${log_collection}" "error:${native_log}\n") + file(APPEND "${Z_VCPKG_LOG_COLLECTION_FILE}" "error:${native_log}\n") endif() endforeach() z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index 869b576059e5f6..2ce501da085a2e 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -78,7 +78,6 @@ Halting portfile execution. set(log_out "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log") set(log_err "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") - set(log_collection "${CURRENT_BUILDTREES_DIR}/logs.txt") set(timeout_param "") set(output_and_error_same OFF) @@ -121,7 +120,7 @@ Halting portfile execution. if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") - file(APPEND "${log_collection}" "error:${native_log}\n") + file(APPEND "${Z_VCPKG_LOG_COLLECTION_FILE}" "error:${native_log}\n") endif() endforeach() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 7cc7afcb961e63..94facd1b744cde 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -139,6 +139,9 @@ if(CMD MATCHES "^BUILD$") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + set(Z_VCPKG_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/logs.txt") + file(REMOVE "${Z_VCPKG_LOG_COLLECTION_FILE}") + include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) include("${SCRIPTS}/build_info.cmake")