Skip to content

Commit 634d6c9

Browse files
author
nullccxsy
committed
add spdlog
1 parent 0830202 commit 634d6c9

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- name: Install dependencies
8484
shell: cmd
8585
run: |
86-
vcpkg install zlib:x64-windows nlohmann-json:x64-windows nanoarrow:x64-windows
86+
vcpkg install zlib:x64-windows nlohmann-json:x64-windows nanoarrow:x64-windows spdlog:x64-windows fmt:x64-windows
8787
- name: Build Iceberg
8888
shell: cmd
8989
run: |

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ function(resolve_arrow_dependency)
9696
set(ZLIB_SOURCE
9797
"SYSTEM"
9898
CACHE STRING "" FORCE)
99+
set(ARROW_WITH_FMT
100+
ON
101+
CACHE BOOL "" FORCE)
102+
set(FMT_SOURCE
103+
"SYSTEM"
104+
CACHE STRING "" FORCE)
99105

100106
fetchcontent_declare(VendoredArrow
101107
${FC_DECLARE_COMMON_OPTIONS}

src/iceberg/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,14 @@ list(APPEND
7474
ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
7575
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,Iceberg::nanoarrow_static,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_static>,nanoarrow::nanoarrow_static,nanoarrow::nanoarrow_shared>>"
7676
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
77-
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
77+
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,$<IF:$<TARGET_EXISTS:spdlog::spdlog>,spdlog::spdlog,spdlog::spdlog>>"
78+
)
7879
list(APPEND
7980
ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
8081
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,Iceberg::nanoarrow_shared,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_shared>,nanoarrow::nanoarrow_shared,nanoarrow::nanoarrow_static>>"
8182
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,Iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
82-
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,spdlog::spdlog>")
83+
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,Iceberg::spdlog,$<IF:$<TARGET_EXISTS:spdlog::spdlog>,spdlog::spdlog,spdlog::spdlog>>"
84+
)
8385

8486
add_iceberg_lib(iceberg
8587
SOURCES

0 commit comments

Comments
 (0)