This is an automated email from the ASF dual-hosted git repository.
wgtmac pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 31659e73 build: rename VendoredArrow to Arrow (#1021)
31659e73 is described below
commit 31659e73db59396bf5c8a4086f39e5b235a3bf68
Author: Gang Wu <[email protected]>
AuthorDate: Fri Oct 16 12:44:10 2026 +0800
build: rename VendoredArrow to Arrow (#1021)
---
cmake_modules/IcebergThirdpartyToolchain.cmake | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake
b/cmake_modules/IcebergThirdpartyToolchain.cmake
index fef63f65..a1a73dcf 100644
--- a/cmake_modules/IcebergThirdpartyToolchain.cmake
+++ b/cmake_modules/IcebergThirdpartyToolchain.cmake
@@ -233,20 +233,18 @@ function(resolve_arrow_dependency)
"https://archive.apache.org/dist/thrift/0.22.0/thrift-0.22.0.tar.gz")
endif()
- fetchcontent_declare(VendoredArrow
+ fetchcontent_declare(Arrow
${FC_DECLARE_COMMON_OPTIONS}
URL ${ARROW_SOURCE_URL}
URL_HASH "SHA256=${ICEBERG_ARROW_BUILD_SHA256_CHECKSUM}"
SOURCE_SUBDIR
cpp
FIND_PACKAGE_ARGS
- NAMES
- Arrow
CONFIG)
- fetchcontent_makeavailable(VendoredArrow)
+ fetchcontent_makeavailable(Arrow)
- if(vendoredarrow_SOURCE_DIR)
+ if(arrow_SOURCE_DIR)
# Arrow's Parquet targets do not inherit the OpenSSL include directory when
# Arrow is vendored; add it for the Parquet encryption sources. Depending
on the
# platform and build type, they are compiled in the object library or
directly in
@@ -270,16 +268,16 @@ function(resolve_arrow_dependency)
add_library(Arrow::arrow_static INTERFACE IMPORTED)
target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
target_include_directories(Arrow::arrow_static
- INTERFACE ${vendoredarrow_BINARY_DIR}/src
- ${vendoredarrow_SOURCE_DIR}/cpp/src)
+ INTERFACE ${arrow_BINARY_DIR}/src
+ ${arrow_SOURCE_DIR}/cpp/src)
endif()
if(NOT TARGET Parquet::parquet_static)
add_library(Parquet::parquet_static INTERFACE IMPORTED)
target_link_libraries(Parquet::parquet_static INTERFACE parquet_static)
target_include_directories(Parquet::parquet_static
- INTERFACE ${vendoredarrow_BINARY_DIR}/src
- ${vendoredarrow_SOURCE_DIR}/cpp/src)
+ INTERFACE ${arrow_BINARY_DIR}/src
+ ${arrow_SOURCE_DIR}/cpp/src)
endif()
set(ARROW_VENDORED TRUE)