From f01c0c672b02cdf9de9217f2b728a71bf6ff8f45 Mon Sep 17 00:00:00 2001 From: XanthosXanthopoulos <38084549+XanthosXanthopoulos@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:38:34 +0200 Subject: [PATCH] Bump spdlog to 1.15 and remove patch (#3529) --- libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake | 6 ++---- libtiledbsoma/cmake/patches/spdlog.patch | 13 ------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 libtiledbsoma/cmake/patches/spdlog.patch diff --git a/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake b/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake index 7ed802b2c4..353fd345c1 100644 --- a/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake +++ b/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake @@ -79,10 +79,8 @@ if (NOT SPDLOG_FOUND) PREFIX "externals" # Set download name to avoid collisions with only the version number in the filename DOWNLOAD_NAME ep_spdlog.zip - URL "https://github.com/gabime/spdlog/archive/v1.10.0.zip" - URL_HASH SHA1=aa2d4ff13b5393dea83d46caf545c6a303c889cd - PATCH_COMMAND - ${CONDITIONAL_PATCH} + URL "https://github.com/gabime/spdlog/archive/v1.15.0.zip" + URL_HASH SHA1=ddf312f7e1fdadf32f475e047bcd1b798422a88c CMAKE_ARGS -DCMAKE_PREFIX_PATH=${EP_INSTALL_PREFIX} -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX} diff --git a/libtiledbsoma/cmake/patches/spdlog.patch b/libtiledbsoma/cmake/patches/spdlog.patch deleted file mode 100644 index b8c4d75215..0000000000 --- a/libtiledbsoma/cmake/patches/spdlog.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h -index d01c08da..5cd01176 100644 ---- a/include/spdlog/logger-inl.h -+++ b/include/spdlog/logger-inl.h -@@ -250,7 +250,7 @@ SPDLOG_INLINE void logger::err_handler_(const std::string &msg) - #if defined(USING_R) && defined(R_R_H) // if in R environment - REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); - #else -- std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); -+ std::fprintf(stderr, "[*** LOG ERROR #%04lu ***] [%s] [%s] {%s}\n", (unsigned long)err_counter, date_buf, name().c_str(), msg.c_str()); - #endif - } - }