Skip to content

ARROW-5827: [C++] Require c-ares CMake config #4783

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.

Sign up for GitHub

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

Closed
kou wants to merge 1 commit into from
Closed

ARROW-5827: [C++] Require c-ares CMake config #4783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions cpp/cmake_modules/Findc-aresAlt.cmake
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,22 +2055,14 @@ endmacro()

if(ARROW_WITH_GRPC)
if(c-ares_SOURCE STREQUAL "AUTO")
find_package(c-ares QUIET)
find_package(c-ares QUIET CONFIG)
if(NOT c-ares_FOUND)
# Fedora doesn't package the CMake config
Copy link
Member

@bkietz bkietz Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean building anything which requires gRPC on Fedora will fail?

Copy link
Member

@wesm wesm Jul 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No -- it means that the system package cannot be used to build gRPC from source. So if -DgRPC_SOURCE=BUNDLED and the system c-ares is found, then gRPC will fail to build

find_package(c-aresAlt)
endif()
if(NOT c-ares_FOUND AND NOT c-aresAlt_FOUND)
build_cares()
endif()
elseif(c-ares_SOURCE STREQUAL "BUNDLED")
build_cares()
elseif(c-ares_SOURCE STREQUAL "SYSTEM")
find_package(c-ares QUIET)
if(NOT c-ares_FOUND)
# Fedora doesn't package the CMake config
find_package(c-aresAlt REQUIRED)
endif()
find_package(c-ares REQUIRED CONFIG)
endif()

# TODO: Don't use global includes but rather target_include_directories
Expand Down