[feat] Use external fmt in spdlog

dingodb · Feb 21, 2025 · 3d24cb0 · 3d24cb0
1 parent e6d8b36
commit 3d24cb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -623,10 +623,12 @@ ExternalProject_Add(spdlog
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DSPDLOG_BUILD_SHARED=OFF
         -DSPDLOG_BUILD_EXAMPLE_HO=OFF
+        -DSPDLOG_FMT_EXTERNAL=ON
     CMAKE_CACHE_ARGS
         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
         -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH}
         -DCMAKE_INSTALL_LIBDIR:PATH=${INSTALL_PATH}/lib
+    DEPENDS fmt
 )
 
 # used by fs

diff --git a/fmt b/fmt
diff --git a/spdlog b/spdlog
+13 −9		CMakeLists.txt
+203 −16		ChangeLog.md
+38 −17		doc/api.md
+1 −1		doc/get-started.md
+3 −0		include/fmt/args.h
+41 −16		include/fmt/base.h
+2 −2		include/fmt/chrono.h
+4 −2		include/fmt/format-inl.h
+33 −33		include/fmt/format.h
+11 −3		include/fmt/ostream.h
+3 −1		include/fmt/ranges.h
+4 −5		include/fmt/std.h
+16 −11		include/fmt/xchar.h
+2 −0		src/fmt.cc
+31 −61		support/release.py
+14 −0		test/args-test.cc
+9 −0		test/base-test.cc
+17 −0		test/compile-test.cc
+4 −0		test/format-test.cc
+10 −3		test/ranges-test.cc
+11 −1		test/std-test.cc
+9 −1		test/xchar-test.cc
+12 −2		.github/workflows/macos.yml
+132 −129		CMakeLists.txt
+3 −0		README.md
+3 −0		example/example.cpp
+2 −2		include/spdlog/cfg/env.h
+1 −6		include/spdlog/common.h
+1 −1		include/spdlog/fmt/bin_to_hex.h
+20 −28		include/spdlog/fmt/bundled/args.h
+1,768 −1,884		include/spdlog/fmt/bundled/base.h
+376 −470		include/spdlog/fmt/bundled/chrono.h
+20 −22		include/spdlog/fmt/bundled/color.h
+46 −24		include/spdlog/fmt/bundled/compile.h
+65 −44		include/spdlog/fmt/bundled/format-inl.h
+1,091 −1,284		include/spdlog/fmt/bundled/format.h
+0 −2		include/spdlog/fmt/bundled/locale.h
+43 −55		include/spdlog/fmt/bundled/os.h
+43 −88		include/spdlog/fmt/bundled/ostream.h
+107 −130		include/spdlog/fmt/bundled/printf.h
+98 −130		include/spdlog/fmt/bundled/ranges.h
+74 −47		include/spdlog/fmt/bundled/std.h
+97 −46		include/spdlog/fmt/bundled/xchar.h
+10 −4		include/spdlog/sinks/ansicolor_sink-inl.h
+4 −3		include/spdlog/sinks/ansicolor_sink.h
+7 −0		include/spdlog/tweakme.h
+1 −1		include/spdlog/version.h
+5 −1		src/bundled_fmtlib_format.cpp
+2 −5		tests/CMakeLists.txt
+9 −0		tests/test_cfg.cpp
+2 −1		tests/test_custom_callbacks.cpp
+3 −5		tests/test_daily_logger.cpp
+2 −1		tests/test_sink.h