From a0e15910630926d45bd2498c0c5ce917318a9f56 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 8 Dec 2022 12:38:07 +0800 Subject: [PATCH] rgw: define FMT_HEADER_ONLY using CMakeLists.txt less repeatings this way. and the macro definition can be populated to the targets linking against `rgw_common`. this is more maintainable, as rgw executables and libraries always link against `rgw_common`. Signed-off-by: Kefu Chai --- src/rgw/CMakeLists.txt | 2 ++ src/rgw/driver/dbstore/common/dbstore.h | 4 ---- src/rgw/driver/dbstore/config/sqlite.cc | 2 -- src/rgw/driver/dbstore/config/store.cc | 2 -- src/rgw/driver/dbstore/sqlite/connection.h | 2 -- src/rgw/driver/rados/cls_fifo_legacy.cc | 2 -- src/rgw/driver/rados/cls_fifo_legacy.h | 2 -- src/rgw/driver/rados/rgw_data_sync.h | 2 -- src/rgw/driver/rados/rgw_datalog.h | 2 -- src/rgw/driver/rados/rgw_log_backing.h | 2 -- src/rgw/rgw_admin.cc | 2 -- src/rgw/rgw_common.h | 2 -- src/rgw/rgw_lc.cc | 4 ---- 13 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index e082de9d09a..2fe0de6c6e5 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -215,6 +215,8 @@ if(WITH_JAEGER) endif() add_library(rgw_common STATIC ${librgw_common_srcs}) +target_compile_definitions(rgw_common + PUBLIC "FMT_HEADER_ONLY") include(CheckCXXCompilerFlag) check_cxx_compiler_flag("-Wimplicit-const-int-float-conversion" diff --git a/src/rgw/driver/dbstore/common/dbstore.h b/src/rgw/driver/dbstore/common/dbstore.h index 12ab3f0600d..70dbd851544 100644 --- a/src/rgw/driver/dbstore/common/dbstore.h +++ b/src/rgw/driver/dbstore/common/dbstore.h @@ -11,10 +11,6 @@ #include #include #include -// this seems safe to use, at least for now--arguably, we should -// prefer header-only fmt, in general -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include "fmt/format.h" #include #include "rgw_sal_store.h" diff --git a/src/rgw/driver/dbstore/config/sqlite.cc b/src/rgw/driver/dbstore/config/sqlite.cc index 051dc34e921..a1b21773556 100644 --- a/src/rgw/driver/dbstore/config/sqlite.cc +++ b/src/rgw/driver/dbstore/config/sqlite.cc @@ -17,8 +17,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include diff --git a/src/rgw/driver/dbstore/config/store.cc b/src/rgw/driver/dbstore/config/store.cc index 66f7471d534..569a093b7d7 100644 --- a/src/rgw/driver/dbstore/config/store.cc +++ b/src/rgw/driver/dbstore/config/store.cc @@ -15,8 +15,6 @@ #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "store.h" diff --git a/src/rgw/driver/dbstore/sqlite/connection.h b/src/rgw/driver/dbstore/sqlite/connection.h index f5cd77d6e26..6088763fd0d 100644 --- a/src/rgw/driver/dbstore/sqlite/connection.h +++ b/src/rgw/driver/dbstore/sqlite/connection.h @@ -18,8 +18,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "sqlite/statement.h" diff --git a/src/rgw/driver/rados/cls_fifo_legacy.cc b/src/rgw/driver/rados/cls_fifo_legacy.cc index 23b39b9fa5f..5b83c850caf 100644 --- a/src/rgw/driver/rados/cls_fifo_legacy.cc +++ b/src/rgw/driver/rados/cls_fifo_legacy.cc @@ -18,8 +18,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "include/rados/librados.hpp" diff --git a/src/rgw/driver/rados/cls_fifo_legacy.h b/src/rgw/driver/rados/cls_fifo_legacy.h index 9a35e4dd251..02ad25bc6a9 100644 --- a/src/rgw/driver/rados/cls_fifo_legacy.h +++ b/src/rgw/driver/rados/cls_fifo_legacy.h @@ -25,8 +25,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "include/rados/librados.hpp" diff --git a/src/rgw/driver/rados/rgw_data_sync.h b/src/rgw/driver/rados/rgw_data_sync.h index ccd56fa6a19..6f05d157c9a 100644 --- a/src/rgw/driver/rados/rgw_data_sync.h +++ b/src/rgw/driver/rados/rgw_data_sync.h @@ -4,8 +4,6 @@ #ifndef CEPH_RGW_DATA_SYNC_H #define CEPH_RGW_DATA_SYNC_H -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include diff --git a/src/rgw/driver/rados/rgw_datalog.h b/src/rgw/driver/rados/rgw_datalog.h index 0bc4837c9c1..695485bf2e4 100644 --- a/src/rgw/driver/rados/rgw_datalog.h +++ b/src/rgw/driver/rados/rgw_datalog.h @@ -17,8 +17,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "include/buffer.h" diff --git a/src/rgw/driver/rados/rgw_log_backing.h b/src/rgw/driver/rados/rgw_log_backing.h index 3fa67d7418b..a431574c46f 100644 --- a/src/rgw/driver/rados/rgw_log_backing.h +++ b/src/rgw/driver/rados/rgw_log_backing.h @@ -14,8 +14,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "include/rados/librados.hpp" diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index f18ce8cfbfb..4ce018f330f 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -12,8 +12,6 @@ extern "C" { #include } -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "auth/Crypto.h" diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index a0af2179ee5..260519fdba0 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -21,8 +21,6 @@ #include #include -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include #include "common/ceph_crypto.h" diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index 0ef047ea93f..4947d410afa 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -32,10 +32,6 @@ #include "rgw_lc_tier.h" #include "rgw_notify.h" -// this seems safe to use, at least for now--arguably, we should -// prefer header-only fmt, in general -#undef FMT_HEADER_ONLY -#define FMT_HEADER_ONLY 1 #include "fmt/format.h" #include "services/svc_sys_obj.h" -- 2.39.5