You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/06/30 00:24:59 UTC
[arrow] branch master updated: ARROW-16933: [C++] Fix google-cloud-cpp build with bundled zlib (#13466)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 2d5f9d6536 ARROW-16933: [C++] Fix google-cloud-cpp build with bundled zlib (#13466)
2d5f9d6536 is described below
commit 2d5f9d6536fa13000534f231ff837b2bf7a0ba31
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Wed Jun 29 20:24:50 2022 -0400
ARROW-16933: [C++] Fix google-cloud-cpp build with bundled zlib (#13466)
Authored-by: Neal Richardson <ne...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index b50b6f7983..a1e7829601 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2267,6 +2267,7 @@ macro(build_zlib)
add_dependencies(ZLIB::ZLIB zlib_ep)
list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
+ set(ZLIB_VENDORED TRUE)
endmacro()
if(ARROW_WITH_ZLIB)
@@ -3970,6 +3971,9 @@ macro(build_google_cloud_cpp_storage)
if(ABSL_VENDORED)
list(APPEND GOOGLE_CLOUD_CPP_PREFIX_PATH_LIST ${ABSL_PREFIX})
endif()
+ if(ZLIB_VENDORED)
+ list(APPEND GOOGLE_CLOUD_CPP_PREFIX_PATH_LIST ${ZLIB_PREFIX})
+ endif()
list(APPEND GOOGLE_CLOUD_CPP_PREFIX_PATH_LIST ${CRC32C_PREFIX})
list(APPEND GOOGLE_CLOUD_CPP_PREFIX_PATH_LIST ${NLOHMANN_JSON_PREFIX})
@@ -4004,6 +4008,9 @@ macro(build_google_cloud_cpp_storage)
if(ABSL_VENDORED)
add_dependencies(google_cloud_cpp_dependencies absl_ep)
endif()
+ if(ZLIB_VENDORED)
+ add_dependencies(google_cloud_cpp_dependencies zlib_ep)
+ endif()
add_dependencies(google_cloud_cpp_dependencies crc32c_ep)
add_dependencies(google_cloud_cpp_dependencies nlohmann_json::nlohmann_json)
@@ -4642,7 +4649,7 @@ macro(build_awssdk)
set_property(TARGET CURL::libcurl
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::SSL)
- if(TARGET zlib_ep)
+ if(ZLIB_VENDORED)
set_property(TARGET aws-cpp-sdk-core
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)