Use global variable

microsoft · Jan 17, 2022 · 4fff1e9 · 4fff1e9
1 parent 29b1532
commit 4fff1e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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")