thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8203 from Jokser/curl-disable-build-messages

Browse Source 
CMake curl build quiet mode
This commit is contained in:
alexey-milovidov 2019-12-13 18:09:42 +03:00 committed by GitHub
commit 9f7dc4e0e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/curl-cmake/CMake/Macros.cmake
View File

@ -35,7 +35,6 @@ macro(curl_internal_test CURL_TEST)
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
endif() endif()
message(STATUS "Performing Curl Test ${CURL_TEST}")
try_compile(${CURL_TEST} try_compile(${CURL_TEST}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
@ -44,12 +43,10 @@ macro(curl_internal_test CURL_TEST)
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
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 Curl Test ${CURL_TEST} - Success")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Performing Curl Test ${CURL_TEST} passed with the following output:\n" "Performing Curl Test ${CURL_TEST} passed with the following output:\n"
"${OUTPUT}\n") "${OUTPUT}\n")
else() else()
message(STATUS "Performing Curl 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 file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Performing Curl Test ${CURL_TEST} failed with the following output:\n" "Performing Curl Test ${CURL_TEST} failed with the following output:\n"
@ -71,7 +68,6 @@ macro(curl_nroff_check)
ERROR_QUIET) ERROR_QUIET)
# Save the option if it was valid # Save the option if it was valid
if(NROFF_MANOPT_OUTPUT) if(NROFF_MANOPT_OUTPUT)
message("Found *nroff option: -- ${_MANOPT}")
set(NROFF_MANOPT ${_MANOPT}) set(NROFF_MANOPT ${_MANOPT})
set(NROFF_USEFUL ON) set(NROFF_USEFUL ON)
break() break()

4
contrib/curl-cmake/CMake/OtherTests.cmake
View File

@ -54,8 +54,6 @@ if(curl_cv_recv)
return 0; return 0;
}" }"
curl_cv_func_recv_test) curl_cv_func_recv_test)
message(STATUS
"Tested: ${recv_retv} recv(${recv_arg1}, ${recv_arg2}, ${recv_arg3}, ${recv_arg4})")
if(curl_cv_func_recv_test) if(curl_cv_func_recv_test)
set(curl_cv_func_recv_args set(curl_cv_func_recv_args
"${recv_arg1},${recv_arg2},${recv_arg3},${recv_arg4},${recv_retv}") "${recv_arg1},${recv_arg2},${recv_arg3},${recv_arg4},${recv_retv}")
@ -118,8 +116,6 @@ if(curl_cv_send)
return 0; return 0;
}" }"
curl_cv_func_send_test) curl_cv_func_send_test)
message(STATUS
"Tested: ${send_retv} send(${send_arg1}, ${send_arg2}, ${send_arg3}, ${send_arg4})")
if(curl_cv_func_send_test) if(curl_cv_func_send_test)
string(REGEX REPLACE "(const) .*" "\\1" send_qual_arg2 "${send_arg2}") string(REGEX REPLACE "(const) .*" "\\1" send_qual_arg2 "${send_arg2}")
string(REGEX REPLACE "const (.*)" "\\1" send_arg2 "${send_arg2}") string(REGEX REPLACE "const (.*)" "\\1" send_arg2 "${send_arg2}")

3
contrib/curl-cmake/CMakeLists.txt
View File

@ -30,6 +30,9 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
SET(CURL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/curl) SET(CURL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/curl)
SET(CURL_LIBRARY_DIR ${CURL_SOURCE_DIR}/lib) SET(CURL_LIBRARY_DIR ${CURL_SOURCE_DIR}/lib)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
# Disable status messages when perform checks
set(CMAKE_REQUIRED_QUIET)
include(Macros) include(Macros)
include(CMakeDependentOption) include(CMakeDependentOption)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)