Skip to content

Commit 34e515f

Browse files
committed
Fixing spdlog issues
1 parent 5d9d11e commit 34e515f

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

cmake/dependencies.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,14 @@ set(SPDLOG_NO_TLS ON CACHE BOOL "prevent spdlog from using thread local storage"
122122
set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "Use external fmt library instead of bundled")
123123

124124
set(SPDLOG_REPO gabime/spdlog)
125-
set(SPDLOG_VER v1.14.1)
125+
set(SPDLOG_VER v1.15.0)
126126
FetchContent_Declare(spdlog
127127
GIT_REPOSITORY https://github.com/${SPDLOG_REPO}
128128
GIT_TAG ${SPDLOG_VER}
129129
GIT_SHALLOW TRUE
130+
131+
PATCH_COMMAND patch -p0 -s -f -i ${CMAKE_CURRENT_LIST_DIR}/patches/spdlog.diff
132+
LOG_PATCH ON
130133
)
131134
list(APPEND DECLARED_DEPENDENCIES spdlog)
132135
list(APPEND DEPENDECIES_JSON "\"spdlog\": \"pkg:github/${SPDLOG_REPO}@${SPDLOG_VER}\"")

cmake/patches/spdlog.diff

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- include/spdlog/fmt/fmt.h
2+
+++ include/spdlog/fmt/fmt.h
3+
@@ -27,4 +27,5 @@
4+
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
5+
#include <fmt/core.h>
6+
#include <fmt/format.h>
7+
+ #include <fmt/xchar.h>
8+
#endif

0 commit comments

Comments
 (0)