c-ares fixes

Change-Id: I5f7cc1291fa6adf9aa4209d8992b9b68283a72c5
This commit is contained in:
Wes McKinney committed 2019-01-22 15:39:56 -06:00
1 parent 8bb701803f
commit b77c3a44f4
1 file changed
+2 -1
+2 -1
View File
@@ -31,6 +31,7 @@ set(THIRDPARTY_DIR "${arrow_SOURCE_DIR}/thirdparty")
if (NOT "$ENV{ARROW_BUILD_TOOLCHAIN}" STREQUAL "")
set(BROTLI_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(BZ2_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(CARES_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(DOUBLE_CONVERSION_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(FLATBUFFERS_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(GFLAGS_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
@@ -1265,7 +1266,7 @@ if (ARROW_FLIGHT)
# If we built gRPC ourselves, we should use its c-ares.
if ("${CARES_STATIC_LIB}" STREQUAL "")
if (NOT "${CARES_HOME}" STREQUAL "")
set(CARES_STATIC_LIB "${CARES_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}cares${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(CARES_STATIC_LIB "${CARES_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}cares_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
elseif (c-ares_FOUND)
get_property(CARES_STATIC_LIB TARGET c-ares::cares_static PROPERTY LOCATION)
endif()