Skip to content

Commit 4af77b0

Browse files
authored
chore: remove spdlog dependency (#459)
We are not currently using spdlog, so the dependency can be removed. It can be added back when it is actually needed.
1 parent ef309f4 commit 4af77b0

File tree

5 files changed

+3
-102
lines changed

5 files changed

+3
-102
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ The following environment variables can be set to customize dependency URLs:
4343
- `ICEBERG_NANOARROW_URL`: Nanoarrow tarball URL
4444
- `ICEBERG_CROARING_URL`: CRoaring tarball URL
4545
- `ICEBERG_NLOHMANN_JSON_URL`: nlohmann-json tarball URL
46-
- `ICEBERG_SPDLOG_URL`: spdlog tarball URL
4746
- `ICEBERG_CPR_URL`: cpr tarball URL
4847

4948
Example usage:

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ set(ICEBERG_ARROW_INSTALL_INTERFACE_LIBS)
3131
# ICEBERG_NANOARROW_URL - Nanoarrow tarball URL
3232
# ICEBERG_CROARING_URL - CRoaring tarball URL
3333
# ICEBERG_NLOHMANN_JSON_URL - nlohmann-json tarball URL
34-
# ICEBERG_SPDLOG_URL - spdlog tarball URL
3534
# ICEBERG_CPR_URL - cpr tarball URL
3635
#
3736
# Example usage:
@@ -427,61 +426,6 @@ function(resolve_nlohmann_json_dependency)
427426
PARENT_SCOPE)
428427
endfunction()
429428

430-
# ----------------------------------------------------------------------
431-
# spdlog
432-
433-
function(resolve_spdlog_dependency)
434-
prepare_fetchcontent()
435-
436-
find_package(Threads REQUIRED)
437-
438-
set(SPDLOG_USE_STD_FORMAT
439-
ON
440-
CACHE BOOL "" FORCE)
441-
set(SPDLOG_BUILD_PIC
442-
ON
443-
CACHE BOOL "" FORCE)
444-
445-
if(DEFINED ENV{ICEBERG_SPDLOG_URL})
446-
set(SPDLOG_URL "$ENV{ICEBERG_SPDLOG_URL}")
447-
else()
448-
set(SPDLOG_URL "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz")
449-
endif()
450-
451-
fetchcontent_declare(spdlog
452-
${FC_DECLARE_COMMON_OPTIONS}
453-
URL ${SPDLOG_URL}
454-
FIND_PACKAGE_ARGS
455-
NAMES
456-
spdlog
457-
CONFIG)
458-
fetchcontent_makeavailable(spdlog)
459-
460-
if(spdlog_SOURCE_DIR)
461-
set_target_properties(spdlog PROPERTIES OUTPUT_NAME "iceberg_vendored_spdlog"
462-
POSITION_INDEPENDENT_CODE ON)
463-
target_link_libraries(spdlog INTERFACE Threads::Threads)
464-
install(TARGETS spdlog
465-
EXPORT iceberg_targets
466-
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
467-
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
468-
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
469-
set(SPDLOG_VENDORED TRUE)
470-
else()
471-
set(SPDLOG_VENDORED FALSE)
472-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES spdlog)
473-
endif()
474-
475-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES Threads)
476-
477-
set(ICEBERG_SYSTEM_DEPENDENCIES
478-
${ICEBERG_SYSTEM_DEPENDENCIES}
479-
PARENT_SCOPE)
480-
set(SPDLOG_VENDORED
481-
${SPDLOG_VENDORED}
482-
PARENT_SCOPE)
483-
endfunction()
484-
485429
# ----------------------------------------------------------------------
486430
# zlib
487431

@@ -575,7 +519,6 @@ resolve_zlib_dependency()
575519
resolve_nanoarrow_dependency()
576520
resolve_croaring_dependency()
577521
resolve_nlohmann_json_dependency()
578-
resolve_spdlog_dependency()
579522

580523
if(ICEBERG_BUILD_BUNDLE)
581524
resolve_arrow_dependency()

src/iceberg/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,27 +107,23 @@ list(APPEND
107107
nanoarrow::nanoarrow_static
108108
nlohmann_json::nlohmann_json
109109
roaring::roaring
110-
spdlog::spdlog
111110
ZLIB::ZLIB)
112111
list(APPEND
113112
ICEBERG_SHARED_BUILD_INTERFACE_LIBS
114113
nanoarrow::nanoarrow_shared
115114
nlohmann_json::nlohmann_json
116115
roaring::roaring
117-
spdlog::spdlog
118116
ZLIB::ZLIB)
119117
list(APPEND
120118
ICEBERG_STATIC_INSTALL_INTERFACE_LIBS
121119
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_static,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_static>,nanoarrow::nanoarrow_static,nanoarrow::nanoarrow_shared>>"
122120
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
123-
"$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>"
124-
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>")
121+
"$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>")
125122
list(APPEND
126123
ICEBERG_SHARED_INSTALL_INTERFACE_LIBS
127124
"$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_shared,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_shared>,nanoarrow::nanoarrow_shared,nanoarrow::nanoarrow_static>>"
128125
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>"
129-
"$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>"
130-
"$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>")
126+
"$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>")
131127

132128
add_iceberg_lib(iceberg
133129
SOURCES

src/iceberg/meson.build

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,9 @@ croaring_needs_static = (
128128
croaring_dep = dependency('croaring', static: croaring_needs_static)
129129
nanoarrow_dep = dependency('nanoarrow')
130130
nlohmann_json_dep = dependency('nlohmann_json')
131-
spdlog_dep = dependency('spdlog')
132131
zlib_dep = dependency('zlib')
133132

134-
iceberg_deps = [
135-
croaring_dep,
136-
nanoarrow_dep,
137-
nlohmann_json_dep,
138-
spdlog_dep,
139-
zlib_dep,
140-
]
133+
iceberg_deps = [croaring_dep, nanoarrow_dep, nlohmann_json_dep, zlib_dep]
141134

142135
iceberg_lib = library(
143136
'iceberg',

subprojects/spdlog.wrap

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)