fix: fmtlib incompatibility problems from 7.1.3 to 5.3.0 (#674)

XiaoMi · Nov 26, 2020 · bed1e63 · bed1e63
1 parent 8c2b6d7
commit bed1e63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/utils/time_utils.cpp b/src/utils/time_utils.cpp
@@ -19,6 +19,9 @@
 
 #include <dsn/utils/time_utils.h>
 #include <fmt/chrono.h>
+#if FMT_VERSION < 60000
+#include <fmt/time.h> // time.h was removed from fmtlib >=6.x
+#endif
 #include <fmt/printf.h>
 
 namespace dsn {

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -192,6 +192,7 @@ ExternalProject_Add(fds
         BUILD_IN_SOURCE 1
         )
 
+# fmtlib >=6.x requires c++14 support, do not update this library for now
 ExternalProject_Add(fmt
         URL ${OSS_URL_PREFIX}/fmt-5.3.0.zip
         https://github.com/fmtlib/fmt/releases/download/5.3.0/fmt-5.3.0.zip