]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake/rgw: dbstore no longer includes src/fmt/include
authorCasey Bodley <cbodley@redhat.com>
Tue, 14 Mar 2023 17:02:51 +0000 (13:02 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 11 Apr 2023 13:22:54 +0000 (09:22 -0400)
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 <cbodley@redhat.com>
(cherry picked from commit 66fe2f0524ad7f26e09d575938751ccfb9940362)

src/rgw/driver/dbstore/CMakeLists.txt

index 0d34d32970b4e2e4e6fa0cb6a4d83824aa088d46..a3aca7a64e4cc1e97424dbb5b29574f4d1658219 100644 (file)
@@ -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}")