include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/xxHash")
include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rapidjson/include")
-include_directories("${CMAKE_SOURCE_DIR}/src/dmclock/src")
-include_directories("${CMAKE_SOURCE_DIR}/src/dmclock/support/src")
-
if(WITH_SEASTAR)
find_package(fmt 4.0.0 QUIET)
if(NOT fmt_FOUND)
add_subdirectory(kv)
add_subdirectory(os)
-set(cls_references_files objclass/class_api.cc)
-add_library(cls_references_objs OBJECT ${cls_references_files})
-
add_subdirectory(osd)
set(ceph_osd_srcs
add_library(GTest::GTest ALIAS gtest)
add_library(GTest::Main ALIAS gtest_main)
endif()
-
- add_subdirectory(test)
endif(WITH_TESTS)
-add_subdirectory(compressor)
-
-add_subdirectory(tools)
-
# dmClock (after gmock)
-
-add_subdirectory(dmclock/src)
-
option(WITH_DMCLOCK_TESTS
"enable the build of dmclock-tests and dmclock-data-struct tests binaries"
OFF)
if(WITH_TESTS AND WITH_DMCLOCK_TESTS)
# note: add_test is not being called, so dmclock tests aren't part
# of ceph tests
- add_subdirectory(dmclock/test)
- add_subdirectory(dmclock/support/test)
-endif(WITH_TESTS AND WITH_DMCLOCK_TESTS)
+ set(dmclock_TEST ON CACHE BOOL "" FORCE)
+endif()
+add_subdirectory(dmclock)
+
+add_subdirectory(compressor)
+
+add_subdirectory(tools)
+
+if(WITH_TESTS)
+ add_subdirectory(test)
+endif()
add_subdirectory(crypto)
mClockClientQueue.cc
OpQueueItem.cc
${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc
+ ${CMAKE_SOURCE_DIR}/src/objclass/class_api.cc
${osd_cyg_functions_src}
${osdc_osd_srcs})
if(HAS_VTA)
PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
endif()
add_library(osd STATIC ${osd_srcs}
- $<TARGET_OBJECTS:cls_references_objs>
$<TARGET_OBJECTS:global_common_objs>)
-target_link_libraries(osd PRIVATE
+target_link_libraries(osd
+ PUBLIC dmclock::dmclock
+ PRIVATE
${LEVELDB_LIBRARIES}
- dmclock heap_profiler cpu_profiler ${CMAKE_DL_LIBS})
+ heap_profiler cpu_profiler ${CMAKE_DL_LIBS})
if(WITH_LTTNG)
add_dependencies(osd osd-tp pg-tp)
endif()
test_mclock_priority_queue.cc
)
add_ceph_unittest(unittest_mclock_priority_queue)
-target_link_libraries(unittest_mclock_priority_queue ceph-common dmclock)
+target_link_libraries(unittest_mclock_priority_queue
+ ceph-common
+ dmclock::dmclock)
# unittest_str_map
add_executable(unittest_str_map