From bed1e63b79c83a45e23b14051b4fe9bea18f29d4 Mon Sep 17 00:00:00 2001 From: Wu Tao Date: Thu, 26 Nov 2020 10:36:33 +0800 Subject: [PATCH] fix: fmtlib incompatibility problems from 7.1.3 to 5.3.0 (#674) --- src/utils/time_utils.cpp | 3 +++ thirdparty/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/src/utils/time_utils.cpp b/src/utils/time_utils.cpp index 31846e2b23..35a3650190 100644 --- a/src/utils/time_utils.cpp +++ b/src/utils/time_utils.cpp @@ -19,6 +19,9 @@ #include #include +#if FMT_VERSION < 60000 +#include // time.h was removed from fmtlib >=6.x +#endif #include namespace dsn { diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 9a03df57bd..3dcd1e1073 100644 --- 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