-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-12326: [C++] Avoid needless c-ares detection #9977
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| set(find_package_args) | ||
| if(c-aresAlt_FIND_VERSION) | ||
| list(APPEND find_package_args ${c-aresAlt_FIND_VERSION}) | ||
| endif() | ||
| if(c-aresAlt_FIND_QUIETLY) | ||
| list(APPEND find_package_args QUIET) | ||
| endif() | ||
| find_package(c-ares ${find_package_args}) | ||
| if(c-ares_FOUND) | ||
| set(c-aresAlt_FOUND TRUE) | ||
| return() | ||
| endif() | ||
|
|
||
| find_package(PkgConfig QUIET) | ||
| pkg_check_modules(c-ares_PC libcares) | ||
| if(c-ares_PC_FOUND) | ||
| set(c-ares_INCLUDE_DIR "${c-ares_PC_INCLUDEDIR}") | ||
|
|
||
| list(APPEND c-ares_PC_LIBRARY_DIRS "${c-ares_PC_LIBDIR}") | ||
| find_library(c-ares_LIB cares | ||
| PATHS ${c-ares_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| elseif(c-ares_ROOT) | ||
| find_library(c-ares_LIB | ||
| NAMES cares | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}cares${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
| PATHS ${c-ares_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_path(c-ares_INCLUDE_DIR | ||
| NAMES ares.h | ||
| PATHS ${c-ares_ROOT} | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES}) | ||
| else() | ||
| find_library(c-ares_LIB | ||
| NAMES cares | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}cares${CMAKE_SHARED_LIBRARY_SUFFIX}" | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_path(c-ares_INCLUDE_DIR NAMES ares.h PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES}) | ||
| endif() | ||
|
|
||
| find_package_handle_standard_args(c-aresAlt REQUIRED_VARS c-ares_LIB c-ares_INCLUDE_DIR) | ||
|
|
||
| if(c-aresAlt_FOUND) | ||
| if(NOT TARGET c-ares::cares) | ||
| add_library(c-ares::cares UNKNOWN IMPORTED) | ||
| set_target_properties( | ||
| c-ares::cares | ||
| PROPERTIES IMPORTED_LOCATION "${c-ares_LIB}" INTERFACE_INCLUDE_DIRECTORIES | ||
| "${c-ares_INCLUDE_DIR}") | ||
| endif() | ||
| endif() |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,222 +24,57 @@ if(gRPC_FOUND) | |
| return() | ||
| endif() | ||
|
|
||
| unset(GRPC_ALT_VERSION) | ||
|
|
||
| if(ARROW_GRPC_USE_SHARED) | ||
| set(GRPC_GPR_LIB_NAMES) | ||
| set(GRPC_GRPC_LIB_NAMES) | ||
| set(GRPC_GRPCPP_LIB_NAMES) | ||
| set(GRPC_ADDRESS_SORTING_LIB_NAMES) | ||
| set(GRPC_UPB_LIB_NAMES) | ||
| if(CMAKE_IMPORT_LIBRARY_SUFFIX) | ||
| list(APPEND GRPC_GPR_LIB_NAMES | ||
| "${CMAKE_IMPORT_LIBRARY_PREFIX}gpr${CMAKE_IMPORT_LIBRARY_SUFFIX}") | ||
| list(APPEND GRPC_GRPC_LIB_NAMES | ||
| "${CMAKE_IMPORT_LIBRARY_PREFIX}grpc${CMAKE_IMPORT_LIBRARY_SUFFIX}") | ||
| list(APPEND GRPC_GRPCPP_LIB_NAMES | ||
| "${CMAKE_IMPORT_LIBRARY_PREFIX}grpc++${CMAKE_IMPORT_LIBRARY_SUFFIX}") | ||
| list( | ||
| APPEND GRPC_ADDRESS_SORTING_LIB_NAMES | ||
| "${CMAKE_IMPORT_LIBRARY_PREFIX}address_sorting${CMAKE_IMPORT_LIBRARY_SUFFIX}" | ||
| ) | ||
| list(APPEND GRPC_UPB_LIB_NAMES | ||
| "${CMAKE_IMPORT_LIBRARY_PREFIX}upb${CMAKE_IMPORT_LIBRARY_SUFFIX}") | ||
| find_package(PkgConfig QUIET) | ||
| pkg_check_modules(GRPCPP_PC grpc++) | ||
| if(GRPCPP_PC_FOUND) | ||
| set(gRPCAlt_VERSION "${GRPCPP_PC_VERSION}") | ||
| set(GRPCPP_INCLUDE_DIRECTORIES ${GRPCPP_PC_INCLUDEDIR}) | ||
| if(ARROW_GRPC_USE_SHARED) | ||
| set(GRPCPP_LINK_LIBRARIES ${GRPCPP_PC_LINK_LIBRARIES}) | ||
| set(GRPCPP_LINK_OPTIONS ${GRPCPP_PC_LDFLAGS_OTHER}) | ||
| set(GRPCPP_COMPILE_OPTIONS ${GRPCPP_PC_CFLAGS_OTHER}) | ||
| else() | ||
| set(GRPCPP_LINK_LIBRARIES) | ||
| foreach(GRPCPP_LIBRARY_NAME ${GRPCPP_PC_STATIC_LIBRARIES}) | ||
| find_library( | ||
| GRPCPP_LIBRARY_${GRPCPP_LIBRARY_NAME} | ||
| NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}${GRPCPP_LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" | ||
| HINTS ${GRPCPP_PC_STATIC_LIBRARY_DIRS}) | ||
| list(APPEND GRPCPP_LINK_LIBRARIES "${GRPCPP_LIBRARY_${GRPCPP_LIBRARY_NAME}}") | ||
| endforeach() | ||
| set(GRPCPP_LINK_OPTIONS ${GRPCPP_PC_STATIC_LDFLAGS_OTHER}) | ||
| set(GRPCPP_COMPILE_OPTIONS ${GRPCPP_PC_STATIC_CFLAGS_OTHER}) | ||
| endif() | ||
| list(APPEND GRPC_GPR_LIB_NAMES | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}gpr${CMAKE_SHARED_LIBRARY_SUFFIX}") | ||
| list(APPEND GRPC_GRPC_LIB_NAMES | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}grpc${CMAKE_SHARED_LIBRARY_SUFFIX}") | ||
| list(APPEND GRPC_GRPCPP_LIB_NAMES | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}grpc++${CMAKE_SHARED_LIBRARY_SUFFIX}") | ||
| list( | ||
| APPEND GRPC_ADDRESS_SORTING_LIB_NAMES | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}address_sorting${CMAKE_SHARED_LIBRARY_SUFFIX}") | ||
| list(APPEND GRPC_UPB_LIB_NAMES | ||
| "${CMAKE_SHARED_LIBRARY_PREFIX}upb${CMAKE_SHARED_LIBRARY_SUFFIX}") | ||
| else() | ||
| set(GRPC_GPR_LIB_NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}gpr${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| set(GRPC_GRPC_LIB_NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}grpc${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| set(GRPC_GRPCPP_LIB_NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}grpc++${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| set(GRPC_ADDRESS_SORTING_LIB_NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}address_sorting${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| set(GRPC_UPB_LIB_NAMES | ||
| "${CMAKE_STATIC_LIBRARY_PREFIX}upb${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||
| endif() | ||
|
|
||
| if(gRPC_ROOT) | ||
| find_library(GRPC_GPR_LIB | ||
| NAMES ${GRPC_GPR_LIB_NAMES} | ||
| PATHS ${gRPC_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_GRPC_LIB | ||
| NAMES ${GRPC_GRPC_LIB_NAMES} | ||
| PATHS ${gRPC_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_GRPCPP_LIB | ||
| NAMES ${GRPC_GRPCPP_LIB_NAMES} | ||
| PATHS ${gRPC_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_ADDRESS_SORTING_LIB | ||
| NAMES ${GRPC_ADDRESS_SORTING_LIB_NAMES} | ||
| PATHS ${gRPC_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_UPB_LIB | ||
| NAMES ${GRPC_UPB_LIB_NAMES} | ||
| PATHS ${gRPC_ROOT} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin NO_DEFAULT_PATH | ||
| PATHS ${gRPC_ROOT} | ||
| list(GET GRPCPP_LINK_LIBRARIES 0 GRPCPP_IMPORTED_LOCATION) | ||
| list(REMOVE_AT GRPCPP_LINK_LIBRARIES 0) | ||
| find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin | ||
| HINTS ${GRPCPP_PC_PREFIX} | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES "bin") | ||
| find_path(GRPC_INCLUDE_DIR | ||
| NAMES grpc/grpc.h | ||
| PATHS ${gRPC_ROOT} | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES}) | ||
| else() | ||
| find_package(PkgConfig QUIET) | ||
| pkg_check_modules(GRPC_PC grpc++) | ||
| if(GRPC_PC_FOUND) | ||
| set(GRPC_ALT_VERSION "${GRPC_PC_VERSION}") | ||
| set(GRPC_INCLUDE_DIR "${GRPC_PC_INCLUDEDIR}") | ||
| list(APPEND GRPC_PC_LIBRARY_DIRS "${GRPC_PC_LIBDIR}") | ||
| message(STATUS "${GRPC_PC_LIBRARY_DIRS}") | ||
|
|
||
| find_library(GRPC_GPR_LIB | ||
| NAMES ${GRPC_GPR_LIB_NAMES} | ||
| PATHS ${GRPC_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_GRPC_LIB | ||
| NAMES ${GRPC_GRPC_LIB_NAMES} | ||
| PATHS ${GRPC_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_GRPCPP_LIB | ||
| NAMES ${GRPC_GRPCPP_LIB_NAMES} | ||
| PATHS ${GRPC_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_ADDRESS_SORTING_LIB | ||
| NAMES ${GRPC_ADDRESS_SORTING_LIB_NAMES} | ||
| PATHS ${GRPC_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_library(GRPC_UPB_LIB | ||
| NAMES ${GRPC_UPB_LIB_NAMES} | ||
| PATHS ${GRPC_PC_LIBRARY_DIRS} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES} | ||
| NO_DEFAULT_PATH) | ||
| find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin | ||
| HINTS ${GRPC_PC_PREFIX} | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES "bin") | ||
| else() | ||
| find_library(GRPC_GPR_LIB | ||
| NAMES ${GRPC_GPR_LIB_NAMES} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_library(GRPC_GRPC_LIB | ||
| NAMES ${GRPC_GRPC_LIB_NAMES} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_library(GRPC_GRPCPP_LIB | ||
| NAMES ${GRPC_GRPCPP_LIB_NAMES} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_library(GRPC_ADDRESS_SORTING_LIB | ||
| NAMES ${GRPC_ADDRESS_SORTING_LIB_NAMES} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_library(GRPC_UPB_LIB | ||
| NAMES ${GRPC_UPB_LIB_NAMES} | ||
| PATH_SUFFIXES ${ARROW_LIBRARY_PATH_SUFFIXES}) | ||
| find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin PATH_SUFFIXES "bin") | ||
| find_path(GRPC_INCLUDE_DIR | ||
| NAMES grpc/grpc.h | ||
| PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES}) | ||
| set(gRPCAlt_FIND_PACKAGE_ARGS gRPCAlt REQUIRED_VARS GRPCPP_IMPORTED_LOCATION | ||
| GRPC_CPP_PLUGIN) | ||
| if(gRPCAlt_VERSION) | ||
| list(APPEND gRPCAlt_FIND_PACKAGE_ARGS VERSION_VAR gRPCAlt_VERSION) | ||
| endif() | ||
| find_package_handle_standard_args(${gRPCAlt_FIND_PACKAGE_ARGS}) | ||
| else() | ||
| set(gRPCAlt_FOUND FALSE) | ||
| endif() | ||
|
|
||
| set(GRPC_ALT_FIND_PACKAGE_ARGS | ||
| gRPCAlt | ||
| REQUIRED_VARS | ||
| GRPC_INCLUDE_DIR | ||
| GRPC_GPR_LIB | ||
| GRPC_GRPC_LIB | ||
| GRPC_GRPCPP_LIB | ||
| GRPC_CPP_PLUGIN) | ||
| if(GRPC_ALT_VERSION) | ||
| list(APPEND GRPC_ALT_FIND_PACKAGE_ARGS VERSION_VAR GRPC_ALT_VERSION) | ||
| endif() | ||
| find_package_handle_standard_args(${GRPC_ALT_FIND_PACKAGE_ARGS}) | ||
|
|
||
| if(gRPCAlt_FOUND) | ||
| add_library(gRPC::gpr UNKNOWN IMPORTED) | ||
| set_target_properties(gRPC::gpr | ||
| PROPERTIES IMPORTED_LOCATION "${GRPC_GPR_LIB}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${GRPC_INCLUDE_DIR}") | ||
|
|
||
| add_library(gRPC::grpc UNKNOWN IMPORTED) | ||
| set_target_properties( | ||
| gRPC::grpc | ||
| PROPERTIES IMPORTED_LOCATION | ||
| "${GRPC_GRPC_LIB}" | ||
| INTERFACE_INCLUDE_DIRECTORIES | ||
| "${GRPC_INCLUDE_DIR}" | ||
| INTERFACE_LINK_LIBRARIES | ||
| "OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB;c-ares::cares") | ||
|
|
||
| set(_GRPCPP_LINK_LIBRARIES "gRPC::grpc;gRPC::gpr") | ||
|
|
||
| if(GRPC_ADDRESS_SORTING_LIB) | ||
| # Address sorting is optional and not always required. | ||
| add_library(gRPC::address_sorting UNKNOWN IMPORTED) | ||
| set_target_properties(gRPC::address_sorting | ||
| PROPERTIES IMPORTED_LOCATION "${GRPC_ADDRESS_SORTING_LIB}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${GRPC_INCLUDE_DIR}") | ||
| set(_GRPCPP_LINK_LIBRARIES "${_GRPCPP_LINK_LIBRARIES};gRPC::address_sorting") | ||
| endif() | ||
|
|
||
| if(GRPC_UPB_LIB) | ||
| # upb is used by recent gRPC versions | ||
| add_library(gRPC::upb UNKNOWN IMPORTED) | ||
| set_target_properties(gRPC::upb | ||
| PROPERTIES IMPORTED_LOCATION "${GRPC_UPB_LIB}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${GRPC_INCLUDE_DIR}") | ||
| set(_GRPCPP_LINK_LIBRARIES "${_GRPCPP_LINK_LIBRARIES};gRPC::upb") | ||
| endif() | ||
|
|
||
| find_package(absl CONFIG) | ||
| if(absl_FOUND) | ||
| # Abseil libraries that recent gRPC versions depend on | ||
| set(_ABSL_LIBS | ||
| bad_optional_access | ||
| int128 | ||
| raw_logging_internal | ||
| str_format_internal | ||
| strings | ||
| throw_delegate | ||
| time | ||
| time_zone) | ||
|
|
||
| foreach(_ABSL_LIB ${_ABSL_LIBS}) | ||
| set(_GRPCPP_LINK_LIBRARIES "${_GRPCPP_LINK_LIBRARIES};absl::${_ABSL_LIB}") | ||
| endforeach() | ||
| endif() | ||
|
|
||
| add_library(gRPC::grpc++ UNKNOWN IMPORTED) | ||
| set_target_properties(gRPC::grpc++ | ||
| PROPERTIES IMPORTED_LOCATION | ||
| "${GRPC_GRPCPP_LIB}" | ||
| INTERFACE_LINK_LIBRARIES | ||
| "${_GRPCPP_LINK_LIBRARIES}" | ||
| "${GRPCPP_IMPORTED_LOCATION}" | ||
| INTERFACE_COMPILE_OPTIONS | ||
| "${GRPCPP_COMPILE_OPTIONS}" | ||
| INTERFACE_INCLUDE_DIRECTORIES | ||
| "${GRPC_INCLUDE_DIR}") | ||
| "${GRPCPP_INCLUDE_DIRECTORIES}" | ||
| INTERFACE_LINK_LIBRARIES | ||
| "${GRPCPP_LINK_LIBRARIES}" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If |
||
| INTERFACE_LINK_OPTIONS | ||
| "${GRPCPP_LINK_OPTIONS}") | ||
|
|
||
| add_executable(gRPC::grpc_cpp_plugin IMPORTED) | ||
| set_target_properties(gRPC::grpc_cpp_plugin | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be an assertion here to check that the required libraries are in
GRPCPP_PC_STATIC_LIBRARIESbefore iterating over them?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that we need it.
Because we already check
GRPCC_PC_FOUND. We can assume thatpkg_check_modules()setsGRPCPP_PC_*andGRPCPP_PC_STATIC_*variables.(I don't think that it can be occurred but) If
GRPCPP_PC_STATIC_LIBRARIESis empty, the followinglist(GET GRPCPP_LINK_LIBRARIES 0 GRPCPP_IMPORTED_LOCATION)is failed. So we can detect invalid value eventually.