@@ -629,14 +629,6 @@ else()
629629 "${THIRDPARTY_MIRROR_URL} /cares-${ARROW_CARES_BUILD_VERSION} .tar.gz" )
630630endif ()
631631
632- if (DEFINED ENV{ARROW_CRC32C_URL})
633- set (CRC32C_SOURCE_URL "$ENV{ARROW_CRC32C_URL} " )
634- else ()
635- set_urls (CRC32C_SOURCE_URL
636- "https://github.com/google/crc32c/archive/${ARROW_CRC32C_BUILD_VERSION} .tar.gz"
637- )
638- endif ()
639-
640632if (DEFINED ENV{ARROW_GBENCHMARK_URL})
641633 set (GBENCHMARK_SOURCE_URL "$ENV{ARROW_GBENCHMARK_URL} " )
642634else ()
@@ -3300,44 +3292,6 @@ endif()
33003292# ----------------------------------------------------------------------
33013293# GCS and dependencies
33023294
3303- function (build_crc32c_once )
3304- list (APPEND CMAKE_MESSAGE_INDENT "CRC32C: " )
3305- message (STATUS "Building CRC32C from source using FetchContent" )
3306- set (CRC32C_VENDORED
3307- TRUE
3308- PARENT_SCOPE )
3309- set (CRC32C_PREFIX "${CMAKE_CURRENT_BINARY_DIR} /crc32c_fc-install" )
3310- set (CRC32C_PREFIX
3311- "${CRC32C_PREFIX} "
3312- PARENT_SCOPE )
3313-
3314- fetchcontent_declare (crc32c
3315- ${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
3316- URL ${CRC32C_SOURCE_URL}
3317- URL_HASH "SHA256=${ARROW_CRC32C_BUILD_SHA256_CHECKSUM} " )
3318-
3319- prepare_fetchcontent ()
3320-
3321- set (CRC32C_BUILD_TESTS OFF )
3322- set (CRC32C_BUILD_BENCHMARKS OFF )
3323- set (CRC32C_USE_GLOG OFF )
3324- fetchcontent_makeavailable (crc32c)
3325-
3326- if (CMAKE_VERSION VERSION_LESS 3.28)
3327- set_property (DIRECTORY ${crc32c_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL TRUE )
3328- endif ()
3329-
3330- # Create alias target for consistency (crc32c exports as Crc32c::crc32c when installed)
3331- if (NOT TARGET Crc32c::crc32c)
3332- add_library (Crc32c::crc32c ALIAS crc32c )
3333- endif ()
3334-
3335- set (ARROW_BUNDLED_STATIC_LIBS
3336- ${ARROW_BUNDLED_STATIC_LIBS} Crc32c::crc32c
3337- PARENT_SCOPE )
3338- list (POP_BACK CMAKE_MESSAGE_INDENT)
3339- endfunction ()
3340-
33413295function (build_nlohmann_json )
33423296 list (APPEND CMAKE_MESSAGE_INDENT "nlohmann-json: " )
33433297 message (STATUS "Building nlohmann-json from source using FetchContent" )
@@ -3378,18 +3332,19 @@ function(build_google_cloud_cpp_storage)
33783332 TRUE
33793333 PARENT_SCOPE )
33803334
3381- # List of dependencies taken from https://github.com/googleapis/google-cloud-cpp/blob/main/doc/packaging.md
3382- build_crc32c_once ()
3383-
33843335 fetchcontent_declare (google_cloud_cpp
33853336 ${FC_DECLARE_COMMON_OPTIONS}
3386- URL ${google_cloud_cpp_storage_SOURCE_URL}
3387- URL_HASH "SHA256=${ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM} " )
3337+ GIT_REPOSITORY https://github.com/googleapis/google-cloud-cpp.git
3338+ GIT_TAG 2b9130f6b28457d9f92eb2e1a98d6aa5d730303f # prepare-for-v3.0.0 branch
3339+ )
33883340
33893341 prepare_fetchcontent ()
33903342
33913343 message (STATUS "Only building the google-cloud-cpp::storage component" )
3392- set (GOOGLE_CLOUD_CPP_ENABLE storage)
3344+ # Disable auto-added features (monitoring, trace, opentelemetry, universe_domain)
3345+ # that require gRPC - storage only needs REST/curl
3346+ set (GOOGLE_CLOUD_CPP_ENABLE
3347+ "storage;-monitoring;-trace;-opentelemetry;-universe_domain" )
33933348 # We need this to build with OpenSSL 3.0.
33943349 # See also: https://github.com/googleapis/google-cloud-cpp/issues/8544
33953350 set (GOOGLE_CLOUD_CPP_ENABLE_WERROR OFF )
0 commit comments