Skip to content

chore: fix a build error due to name conflict #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2025
Merged

chore: fix a build error due to name conflict #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cmake_modules/IcebergThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function(resolve_arrow_dependency)
"BUNDLED"
CACHE STRING "" FORCE)

fetchcontent_declare(Arrow
fetchcontent_declare(VendoredArrow
${FC_DECLARE_COMMON_OPTIONS}
GIT_REPOSITORY https://github.com/wgtmac/arrow.git
GIT_TAG 7d50c4ac803ad983734de5f418b7cd18f25b0dc9
Expand All @@ -100,23 +100,23 @@ function(resolve_arrow_dependency)
Arrow
CONFIG)

fetchcontent_makeavailable(Arrow)
fetchcontent_makeavailable(VendoredArrow)

if(arrow_SOURCE_DIR)
if(vendoredarrow_SOURCE_DIR)
if(NOT TARGET Arrow::arrow_static)
add_library(Arrow::arrow_static INTERFACE IMPORTED)
target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
target_include_directories(Arrow::arrow_static
INTERFACE ${arrow_BINARY_DIR}/src
${arrow_SOURCE_DIR}/cpp/src)
INTERFACE ${vendoredarrow_BINARY_DIR}/src
${vendoredarrow_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 ${arrow_BINARY_DIR}/src
${arrow_SOURCE_DIR}/cpp/src)
INTERFACE ${vendoredarrow_BINARY_DIR}/src
${vendoredarrow_SOURCE_DIR}/cpp/src)
endif()

set(ARROW_VENDORED TRUE)
Expand Down
Loading