Skip to content

Commit b839b3b

Browse files
authored
chore: fix a build error due to name conflict (#90)
1 parent 8aa7fd7 commit b839b3b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function(resolve_arrow_dependency)
8787
"BUNDLED"
8888
CACHE STRING "" FORCE)
8989

90-
fetchcontent_declare(Arrow
90+
fetchcontent_declare(VendoredArrow
9191
${FC_DECLARE_COMMON_OPTIONS}
9292
GIT_REPOSITORY https://github.com/wgtmac/arrow.git
9393
GIT_TAG 7d50c4ac803ad983734de5f418b7cd18f25b0dc9
@@ -100,23 +100,23 @@ function(resolve_arrow_dependency)
100100
Arrow
101101
CONFIG)
102102

103-
fetchcontent_makeavailable(Arrow)
103+
fetchcontent_makeavailable(VendoredArrow)
104104

105-
if(arrow_SOURCE_DIR)
105+
if(vendoredarrow_SOURCE_DIR)
106106
if(NOT TARGET Arrow::arrow_static)
107107
add_library(Arrow::arrow_static INTERFACE IMPORTED)
108108
target_link_libraries(Arrow::arrow_static INTERFACE arrow_static)
109109
target_include_directories(Arrow::arrow_static
110-
INTERFACE ${arrow_BINARY_DIR}/src
111-
${arrow_SOURCE_DIR}/cpp/src)
110+
INTERFACE ${vendoredarrow_BINARY_DIR}/src
111+
${vendoredarrow_SOURCE_DIR}/cpp/src)
112112
endif()
113113

114114
if(NOT TARGET Parquet::parquet_static)
115115
add_library(Parquet::parquet_static INTERFACE IMPORTED)
116116
target_link_libraries(Parquet::parquet_static INTERFACE parquet_static)
117117
target_include_directories(Parquet::parquet_static
118-
INTERFACE ${arrow_BINARY_DIR}/src
119-
${arrow_SOURCE_DIR}/cpp/src)
118+
INTERFACE ${vendoredarrow_BINARY_DIR}/src
119+
${vendoredarrow_SOURCE_DIR}/cpp/src)
120120
endif()
121121

122122
set(ARROW_VENDORED TRUE)

0 commit comments

Comments
 (0)