From f87c3363efafbcbf124c8839f446676b05231c0c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 2 Aug 2024 13:38:14 +0200 Subject: [PATCH] cmake: drop custom `CMakeOutput.log`/`CMakeError.log` logs CMake writes this information into `CMakeConfigureLog.yaml` automatically. Closes #14356 --- CMake/Macros.cmake | 8 +------- appveyor.sh | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake index d5439fcc04..a8664baa4b 100644 --- a/CMake/Macros.cmake +++ b/CMake/Macros.cmake @@ -55,15 +55,9 @@ macro(curl_internal_test CURL_TEST) if(${CURL_TEST}) set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}") message(STATUS "Performing Test ${CURL_TEST} - Success") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Performing Test ${CURL_TEST} passed with the following output:\n" - "${OUTPUT}\n") else() - message(STATUS "Performing Test ${CURL_TEST} - Failed") set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Performing Test ${CURL_TEST} failed with the following output:\n" - "${OUTPUT}\n") + message(STATUS "Performing Test ${CURL_TEST} - Failed") endif() endif() endmacro() diff --git a/appveyor.sh b/appveyor.sh index 9e5dac84c4..a2925e647a 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -118,9 +118,7 @@ else fi if false; then - for log in CMakeFiles/CMakeConfigureLog.yaml CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log; do - [ -r "_bld/${log}" ] && cat "_bld/${log}" - done + cat CMakeFiles/CMakeConfigureLog.yaml 2>/dev/null || true fi # build tests -- 2.47.3