From 4a9b86af824fae895aee52a71a81503b8ae058f9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 14 Mar 2023 13:02:51 -0400 Subject: [PATCH] cmake/rgw: dbstore no longer includes src/fmt/include if we're using system fmt, we shouldn't mix the submodule's headers. src/CMakeLists.txt already adds global include_directories() for the correct fmt headers Signed-off-by: Casey Bodley (cherry picked from commit 66fe2f0524ad7f26e09d575938751ccfb9940362) --- src/rgw/driver/dbstore/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rgw/driver/dbstore/CMakeLists.txt b/src/rgw/driver/dbstore/CMakeLists.txt index 0d34d32970b..a3aca7a64e4 100644 --- a/src/rgw/driver/dbstore/CMakeLists.txt +++ b/src/rgw/driver/dbstore/CMakeLists.txt @@ -26,7 +26,6 @@ set(dbstore_mgr_srcs add_library(dbstore_lib ${dbstore_srcs}) target_include_directories(dbstore_lib - PUBLIC "${CMAKE_SOURCE_DIR}/src/fmt/include" PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw" PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -- 2.39.5