Skip to content

Commit bb1cada

Browse files
gty404shuxu.li
authored andcommitted
chore: upgrade nanoarrow dependency (apache#146)
1 parent a61e142 commit bb1cada

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,14 @@ function(resolve_nanoarrow_dependency)
238238

239239
fetchcontent_declare(nanoarrow
240240
${FC_DECLARE_COMMON_OPTIONS}
241-
URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.6.0/apache-arrow-nanoarrow-0.6.0.tar.gz"
241+
URL "https://dlcdn.apache.org/arrow/apache-arrow-nanoarrow-0.7.0/apache-arrow-nanoarrow-0.7.0.tar.gz"
242242
)
243243
fetchcontent_makeavailable(nanoarrow)
244244

245-
set_target_properties(nanoarrow PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow"
246-
POSITION_INDEPENDENT_CODE ON)
247-
install(TARGETS nanoarrow
245+
set_target_properties(nanoarrow_static
246+
PROPERTIES OUTPUT_NAME "iceberg_vendored_nanoarrow"
247+
POSITION_INDEPENDENT_CODE ON)
248+
install(TARGETS nanoarrow_static
248249
EXPORT iceberg_targets
249250
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
250251
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"

src/iceberg/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@ set(ICEBERG_SHARED_INSTALL_INTERFACE_LIBS)
5555

5656
list(APPEND
5757
ICEBERG_STATIC_BUILD_INTERFACE_LIBS
58-
nanoarrow::nanoarrow
58+
nanoarrow::nanoarrow_static
5959
nlohmann_json::nlohmann_json
6060
spdlog::spdlog
6161
ZLIB::ZLIB)
6262
list(APPEND
6363
ICEBERG_SHARED_BUILD_INTERFACE_LIBS
64-
nanoarrow::nanoarrow
64+
nanoarrow::nanoarrow_shared
6565
nlohmann_json::nlohmann_json
6666
spdlog::spdlog
6767
ZLIB::ZLIB)
6868
list(APPEND
6969
ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
70-
"Iceberg::nanoarrow"
70+
"Iceberg::nanoarrow_static"
7171
"Iceberg::nlohmann_json"
7272
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
7373
list(APPEND
7474
ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
75-
"Iceberg::nanoarrow"
75+
"Iceberg::nanoarrow_shared"
7676
"Iceberg::nlohmann_json"
7777
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
7878

0 commit comments

Comments
 (0)