gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

dmclock: Integrate fully into Ceph project

Browse Source 
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>
This commit is contained in:
Adam C. Emerson 2026-01-14 19:53:15 -05:00
parent bc209e6daf
commit eeed5bc3cd
No known key found for this signature in database
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dmclock/CMakeLists.txt
View File

@ -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)

4
src/dmclock/src/CMakeLists.txt
View File

@ -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