mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:29:08 +08:00
ae76307e4b
* Audit use of TO_NATIVE_PATH. TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE. Fixes https://github.com/microsoft/vcpkg/issues/26178 ports/ffmpeg/portfile.cmake: Both uses are being embedded into a command line ✅ ports/gdal/dependency_win.cmake 117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate. Drive by: Added quotes around other uses (all of which seem to be going to command lines). 202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now. ports/msmpi/portfile.cmake All 3 uses are being embedded into a command line ✅ ports/jemalloc/fix-utilities.patch ports/libproxy/fix-dependency-libmodman.patch ports/qtbase/env.patch These are in upstream content / context so it is not edited. ports/opengl/portfile.cmake Broken! Drive by fixes: * Modernized checking VCPKG_BUILD_TYPE * Ordered things consistently to be release then debug. * Removed funny newlines. ports/openni2/portfile.cmake Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes: * Guarded debug-only copies for VCPKG_BUILD_TYPE * Fixed supports expression ports/openssl/unix/CMakeLists.txt: Unused! ports/pthreads/portfile.cmake: Both uses are being embedded into a command line ✅ ports/qt5-base/cmake/qt_fix_makefile_install.cmake I'm not sure if this one is OK but it's being embedded into a file so it's probably fine. ports/qtapplicationmanager/portfile.cmake: I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited. ports/readosm/portfile.cmake: The use is being embedded into a command line ✅ ports/spatialite-tools/portfile.cmake: The use is being embedded into a command line ✅ ports/sqlcipher/portfile.cmake: Both uses are being embedded into a command line ✅ scripts/ports.cmake: Some uses were unused, others are immediately used and printed to the console. ✅ scripts/buildsystems/vcpkg.cmake: Fixed :) scripts/cmake/vcpkg_build_qmake: Looks unused. scripts/cmake/vcpkg_build_process.cmake: Added to console message only. ✅ scripts/cmake/vcpkg_execute_required_process_repeat.cmake: Added to console message only. ✅ Drive by: Fixed typo in variable name in the message. scripts/cmake/vcpkg_execute_required_process.cmake: Added to console message only. ✅ * Fix missing license.
72 lines
2.3 KiB
CMake
72 lines
2.3 KiB
CMake
function(vcpkg_execute_required_process_repeat)
|
|
cmake_parse_arguments(PARSE_ARGV 0 arg
|
|
"ALLOW_IN_DOWNLOAD_MODE"
|
|
"COUNT;WORKING_DIRECTORY;LOGNAME"
|
|
"COMMAND"
|
|
)
|
|
|
|
if(DEFINED arg_UNPARSED_ARGUMENTS)
|
|
message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
|
|
endif()
|
|
foreach(required_arg IN ITEMS COUNT WORKING_DIRECTORY LOGNAME COMMAND)
|
|
if(NOT DEFINED arg_${required_arg})
|
|
message(FATAL_ERROR "${required_arg} must be specified.")
|
|
endif()
|
|
endforeach()
|
|
|
|
# also checks for COUNT being an integer
|
|
if(NOT arg_COUNT GREATER_EQUAL "1")
|
|
message(FATAL_ERROR "COUNT (${arg_COUNT}) must be greater than or equal to 1.")
|
|
endif()
|
|
|
|
if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE)
|
|
message(FATAL_ERROR
|
|
[[
|
|
This command cannot be executed in Download Mode.
|
|
Halting portfile execution.
|
|
]])
|
|
endif()
|
|
|
|
if(X_PORT_PROFILE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE)
|
|
vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time")
|
|
endif()
|
|
|
|
set(all_logs "")
|
|
foreach(loop_count RANGE 1 ${arg_COUNT})
|
|
set(out_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log")
|
|
set(err_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log")
|
|
list(APPEND all_logs "${out_log}" "${err_log}")
|
|
|
|
vcpkg_execute_in_download_mode(
|
|
COMMAND ${arg_COMMAND}
|
|
OUTPUT_FILE "${out_log}"
|
|
ERROR_FILE "${err_log}"
|
|
RESULT_VARIABLE error_code
|
|
WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}"
|
|
)
|
|
if(error_code EQUAL "0")
|
|
return()
|
|
endif()
|
|
endforeach()
|
|
|
|
set(stringified_logs "")
|
|
foreach(log IN LISTS all_logs)
|
|
if(NOT EXISTS "${log}")
|
|
continue()
|
|
endif()
|
|
file(SIZE "${log}" log_size)
|
|
if(NOT log_size EQUAL "0")
|
|
file(TO_NATIVE_PATH "${log}" native_log)
|
|
string(APPEND stringified_logs " ${native_log}\n")
|
|
endif()
|
|
endforeach()
|
|
|
|
z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND})
|
|
message(FATAL_ERROR
|
|
" Command failed: ${pretty_command}\n"
|
|
" Working Directory: ${arg_WORKING_DIRECTORY}\n"
|
|
" See logs for more information:\n"
|
|
"${stringified_logs}"
|
|
)
|
|
endfunction()
|