luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: drop custom CMakeOutput.log/CMakeError.log logs

Browse Source 
CMake writes this information into `CMakeConfigureLog.yaml`
automatically.

Closes #14356
This commit is contained in:
Viktor Szakats 2024-08-02 13:38:14 +02:00
parent 39b9ccea8d
commit f87c3363ef
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMake/Macros.cmake
View File

@ -55,15 +55,9 @@ macro(curl_internal_test CURL_TEST)
if(${CURL_TEST}) if(${CURL_TEST})
set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}") set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}")
message(STATUS "Performing Test ${CURL_TEST} - Success") 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() else()
message(STATUS "Performing Test ${CURL_TEST} - Failed")
set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}") set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log message(STATUS "Performing Test ${CURL_TEST} - Failed")
"Performing Test ${CURL_TEST} failed with the following output:\n"
"${OUTPUT}\n")
endif() endif()
endif() endif()
endmacro() endmacro()

4
appveyor.sh
View File

@ -118,9 +118,7 @@ else
fi fi
if false; then if false; then
for log in CMakeFiles/CMakeConfigureLog.yaml CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log; do cat CMakeFiles/CMakeConfigureLog.yaml 2>/dev/null || true
[ -r "_bld/${log}" ] && cat "_bld/${log}"
done
fi fi
# build tests # build tests