From eeed5bc3cd4224b995209f30c33d3afbb0e34364 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Wed, 14 Jan 2026 19:53:15 -0500
Subject: [PATCH] dmclock: Integrate fully into Ceph project

Setting the policy to allow it to use `BOOST_ROOT` causes a build
failure in make check on github, so just have it be part of the Ceph
project.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/dmclock/CMakeLists.txt     | 22 ----------------------
 src/dmclock/src/CMakeLists.txt |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/dmclock/CMakeLists.txt b/src/dmclock/CMakeLists.txt
index 52742e846f8..206e9e691fb 100644
--- a/src/dmclock/CMakeLists.txt
+++ b/src/dmclock/CMakeLists.txt
@@ -1,30 +1,8 @@
-cmake_minimum_required(VERSION 3.22.1)
-
-project(dmclock CXX)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
-
-if (NOT(BOOST_FOUND))
-  find_package(Boost REQUIRED)
-endif()
-
-find_package(Threads)
-
-if(CMAKE_CXX_STANDARD OR CMAKE_CXX_FLAGS MATCHES "-std=(c|gnu)\\+\\+")
-  # use existing settings if available
-else()
-  set(CMAKE_CXX_STANDARD 11)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-
 add_subdirectory(src)
 
 # Determine if dmclock is built as a subproject (using add_subdirectory)
 # or if it is the master project.
 set(MASTER_PROJECT FALSE)
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(MASTER_PROJECT TRUE)
-endif()
 
 option(dmclock_TEST "Generate test targets" ${MASTER_PROJECT})
 if(dmclock_TEST)
diff --git a/src/dmclock/src/CMakeLists.txt b/src/dmclock/src/CMakeLists.txt
index d13229e4028..4d490ced0d7 100644
--- a/src/dmclock/src/CMakeLists.txt
+++ b/src/dmclock/src/CMakeLists.txt
@@ -6,8 +6,8 @@ add_library(dmclock::dmclock ALIAS dmclock)
 target_compile_options(dmclock PRIVATE
   "-Wno-write-strings" "-Wall")
 target_include_directories(dmclock PUBLIC
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/support/src>)
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/dmclock/src>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/dmclock/support/src>)
 
 target_link_libraries(dmclock
   PUBLIC Boost::boost
-- 
2.47.3