[arrow] branch main updated: GH-36944: [C++] Unify OpenSSL detection for building GCS (#36945)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new eddb2b9600 GH-36944: [C++] Unify OpenSSL detection for building GCS 
(#36945)
eddb2b9600 is described below

commit eddb2b960024c1c8f1c384755bcb2488f116dca2
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Mon Jul 31 14:06:45 2023 +0900

    GH-36944: [C++] Unify OpenSSL detection for building GCS (#36945)
    
    ### Rationale for this change
    
    `build_google_cloud_cpp_storage()` calls `resolve_dependency(OpenSSL)` but 
it should not be here. We should have only one `resolve_dependency(OpenSSL)` 
for easy to maintain.
    
    ### What changes are included in this PR?
    
    Don't call `resolve_dependency(OpenSSL)` from 
`build_google_cloud_cpp_storage()`.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #36944
    
    Authored-by: Sutou Kouhei <k...@clear-code.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 635bc1684e..1e7840cf92 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1368,8 +1368,9 @@ set(ARROW_OPENSSL_REQUIRED_VERSION "1.0.2")
 set(ARROW_USE_OPENSSL OFF)
 if(PARQUET_REQUIRE_ENCRYPTION
    OR ARROW_FLIGHT
-   OR ARROW_S3
-   OR ARROW_GANDIVA)
+   OR ARROW_GANDIVA
+   OR ARROW_GCS
+   OR ARROW_S3)
   set(OpenSSL_SOURCE "SYSTEM")
   resolve_dependency(OpenSSL
                      HAVE_ALT
@@ -4106,10 +4107,6 @@ macro(build_google_cloud_cpp_storage)
   # Curl is required on all platforms, but building it internally might also 
trip over S3's copy.
   # For now, force its inclusion from the underlying system or fail.
   find_curl()
-  if(NOT OpenSSL_FOUND)
-    resolve_dependency(OpenSSL HAVE_ALT REQUIRED_VERSION
-                       ${ARROW_OPENSSL_REQUIRED_VERSION})
-  endif()
 
   # Build google-cloud-cpp, with only storage_client