Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade spdlog dependency to 1.12 #283

Merged
merged 2 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ find_package(mutils REQUIRED)
find_package(mutils-containers REQUIRED)

# Target: spdlog::spdlog
find_package(spdlog 1.3.1...1.9.2 REQUIRED)
find_package(spdlog 1.12.0 REQUIRED)

# Target: OpenSSL::Crypto and OpenSSL::ssl
find_package(OpenSSL 1.1.1 REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion derechoConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include(CMakeFindDependencyMacro)
# we need to ensure these targets are forwarded to downstream projects that depend on Derecho
find_dependency(mutils)
find_dependency(mutils-containers)
find_dependency(spdlog 1.3.1)
find_dependency(spdlog 1.12.0)
find_dependency(OpenSSL 1.1.1)
find_dependency(nlohmann_json 3.9.0)

Expand Down
1 change: 1 addition & 0 deletions include/derecho/utils/logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <atomic>
#include <spdlog/spdlog.h>
#include <spdlog/fmt/ostr.h>
#include <spdlog/fmt/ranges.h>
#include <spdlog/sinks/rotating_file_sink.h>
#include <spdlog/sinks/stdout_color_sinks.h>

Expand Down
3 changes: 3 additions & 0 deletions src/applications/tests/unit_tests/client_callback_mockup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ enum class ClientCallbackType {

std::ostream& operator<<(std::ostream& os, const ClientCallbackType& cb_type);

template <>
struct fmt::formatter<ClientCallbackType> : fmt::ostream_formatter {};

/**
* Structure used by StorageNode to pass callback requests from the
* register_callback RPC function to the callback-sending thread.
Expand Down
Loading