RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-04 23:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: add top-level libraddosstriper conditional

Browse Source 
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
This commit is contained in:
Jesse Williamson 2018-05-10 16:20:42 -07:00
parent 2bec876995
commit 5513a90c62
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/config-h.in.cmake
View File

@ -333,6 +333,9 @@
/* Defined if boost::context is available */ /* Defined if boost::context is available */
#cmakedefine HAVE_BOOST_CONTEXT #cmakedefine HAVE_BOOST_CONTEXT
/* Defined if libradosstriper is enabled: */
#cmakedefine WITH_LIBRADOSSTRIPER
/* Defined if OpenSSL is available for the rgw beast frontend */ /* Defined if OpenSSL is available for the rgw beast frontend */
#cmakedefine WITH_RADOSGW_BEAST_OPENSSL #cmakedefine WITH_RADOSGW_BEAST_OPENSSL

4
src/test/CMakeLists.txt
View File

@ -33,7 +33,9 @@ add_subdirectory(journal)
add_subdirectory(libcephfs) add_subdirectory(libcephfs)
add_subdirectory(librados) add_subdirectory(librados)
add_subdirectory(librados_test_stub) add_subdirectory(librados_test_stub)
if(WITH_LIBRADOSSTRIPER)
add_subdirectory(libradosstriper) add_subdirectory(libradosstriper)
endif()
if(WITH_RBD) if(WITH_RBD)
add_subdirectory(librbd) add_subdirectory(librbd)
endif(WITH_RBD) endif(WITH_RBD)
@ -642,12 +644,14 @@ add_ceph_unittest(unittest_workqueue)
target_link_libraries(unittest_workqueue global) target_link_libraries(unittest_workqueue global)
# unittest_striper # unittest_striper
if(WITH_LIBRADOSSTRIPER)
add_executable(unittest_striper add_executable(unittest_striper
test_striper.cc test_striper.cc
$<TARGET_OBJECTS:unit-main> $<TARGET_OBJECTS:unit-main>
) )
add_ceph_unittest(unittest_striper) add_ceph_unittest(unittest_striper)
target_link_libraries(unittest_striper global ${BLKID_LIBRARIES}) target_link_libraries(unittest_striper global ${BLKID_LIBRARIES})
endif(WITH_LIBRADOSSTRIPER)
# unittest_prebufferedstreambuf # unittest_prebufferedstreambuf
add_executable(unittest_prebufferedstreambuf add_executable(unittest_prebufferedstreambuf

3
src/test/libradosstriper/CMakeLists.txt
View File

@ -1,3 +1,6 @@
#
# Note: only compiled if WITH_LIBRADOSSTRIPER is defined.
#
add_library(rados_striper_test STATIC TestCase.cc) add_library(rados_striper_test STATIC TestCase.cc)
target_link_libraries(rados_striper_test radostest) target_link_libraries(rados_striper_test radostest)
set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS

8
src/tools/CMakeLists.txt
View File

@ -7,7 +7,13 @@ set(rados_srcs
${PROJECT_SOURCE_DIR}/src/common/obj_bencher.cc ${PROJECT_SOURCE_DIR}/src/common/obj_bencher.cc
${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc) ${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc)
add_executable(rados ${rados_srcs}) add_executable(rados ${rados_srcs})
target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} radosstriper)
target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
if(WITH_LIBRADOSSTRIPER)
target_link_libraries(rados radosstriper)
else()
target_link_libraries(rados cls_lock_client)
endif()
install(TARGETS rados DESTINATION bin) install(TARGETS rados DESTINATION bin)
if(WITH_TESTS) if(WITH_TESTS)