Skip to content

Commit 31659e7

Browse files
authored
build: rename VendoredArrow to Arrow (#1021)
1 parent 7f24700 commit 31659e7

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

‎cmake_modules/IcebergThirdpartyToolchain.cmake‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,20 +233,18 @@ function(resolve_arrow_dependency)
233233
"https://archive.apache.org/dist/thrift/0.22.0/thrift-0.22.0.tar.gz")
234234
endif()
235235

236-
fetchcontent_declare(VendoredArrow
236+
fetchcontent_declare(Arrow
237237
${FC_DECLARE_COMMON_OPTIONS}
238238
URL ${ARROW_SOURCE_URL}
239239
URL_HASH "SHA256=${ICEBERG_ARROW_BUILD_SHA256_CHECKSUM}"
240240
SOURCE_SUBDIR
241241
cpp
242242
FIND_PACKAGE_ARGS
243-
NAMES
244-
Arrow
245243
CONFIG)
246244

247-
fetchcontent_makeavailable(VendoredArrow)
245+
fetchcontent_makeavailable(Arrow)
248246

249-
if(vendoredarrow_SOURCE_DIR)
247+
if(arrow_SOURCE_DIR)
250248
# Arrow's Parquet targets do not inherit the OpenSSL include directory when
251249
# Arrow is vendored; add it for the Parquet encryption sources. Depending on the
252250
# platform and build type, they are compiled in the object library or directly in
@@ -270,16 +268,16 @@ function(resolve_arrow_dependency)
270268
add_library(Arrow::arrow_static INTERFACE IMPORTED)
271269
target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
272270
target_include_directories(Arrow::arrow_static
273-
INTERFACE ${vendoredarrow_BINARY_DIR}/src
274-
${vendoredarrow_SOURCE_DIR}/cpp/src)
271+
INTERFACE ${arrow_BINARY_DIR}/src
272+
${arrow_SOURCE_DIR}/cpp/src)
275273
endif()
276274

277275
if(NOT TARGET Parquet::parquet_static)
278276
add_library(Parquet::parquet_static INTERFACE IMPORTED)
279277
target_link_libraries(Parquet::parquet_static INTERFACE parquet_static)
280278
target_include_directories(Parquet::parquet_static
281-
INTERFACE ${vendoredarrow_BINARY_DIR}/src
282-
${vendoredarrow_SOURCE_DIR}/cpp/src)
279+
INTERFACE ${arrow_BINARY_DIR}/src
280+
${arrow_SOURCE_DIR}/cpp/src)
283281
endif()
284282

285283
set(ARROW_VENDORED TRUE)

0 commit comments

Comments
 (0)