This is an automated email from the ASF dual-hosted git repository. wesm pushed a commit to branch maint-0.14.x in repository https://gitbox.apache.org/repos/asf/arrow.git
commit e74b9d16a2988cc1b2b624b8290cdcb160901b9c Author: Sutou Kouhei <[email protected]> AuthorDate: Fri Jul 5 09:03:04 2019 +0200 ARROW-5838: [C++] Delegate OPENSSL_ROOT_DIR to bundled gRPC Author: Sutou Kouhei <[email protected]> Closes #4795 from kou/cpp-macos-grpc-openssl and squashes the following commits: 6014d4573 <Sutou Kouhei> Delegate OPENSSL_ROOT_DIR to bundled gRPC --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index b913123..a8595e9 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2140,6 +2140,9 @@ macro(build_grpc) -DCMAKE_INSTALL_LIBDIR=lib "-DProtobuf_PROTOC_LIBRARY=${GRPC_Protobuf_PROTOC_LIBRARY}" -DBUILD_SHARED_LIBS=OFF) + if(OPENSSL_ROOT_DIR) + list(APPEND GRPC_CMAKE_ARGS -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}) + endif() # XXX the gRPC git checkout is huge and takes a long time # Ideally, we should be able to use the tarballs, but they don't contain
