RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Add Graylog logging backend build support

Browse Source 
Signed-off-by: Marcel Lauhoff <lauhoff@uni-mainz.de>
This commit is contained in:
Marcel Lauhoff 2016-01-12 15:39:58 +01:00
parent 3968852c1b
commit 882672dcfa
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -22,7 +22,7 @@ if(WITH_CCACHE)
endif(CCACHE_FOUND)
endif(WITH_CCACHE)
include_directories(
include_directories(
${PROJECT_BINARY_DIR}/src/include
${OFED_PREFIX}/include
${LEVELDB_PREFIX}/include
@ -42,7 +42,7 @@ include(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(fallocate CEPH_HAVE_FALLOCATE)
CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE)
CHECK_FUNCTION_EXISTS(posix_fallocate HAVE_POSIX_FALLOCATE)
CHECK_FUNCTION_EXISTS(syncfs HAVE_SYS_SYNCFS)
CHECK_FUNCTION_EXISTS(syncfs HAVE_SYS_SYNCFS)
CHECK_FUNCTION_EXISTS(sync_file_range HAVE_SYNC_FILE_RANGE)
CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
@ -291,7 +291,7 @@ else(${ENABLE_SHARED})
endif(${ENABLE_SHARED})
set(Boost_USE_MULTITHREADED ON)
find_package(Boost COMPONENTS thread system regex random program_options date_time REQUIRED)
find_package(Boost COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
find_package(Threads REQUIRED)
@ -305,7 +305,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# find out which platform we are building on
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(OperatingSystem "Mac OS X")
set(OperatingSystem "Mac OS X")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# enables testing and creates Make check command

26
src/CMakeLists.txt
View File

@ -317,6 +317,7 @@ set(libcommon_files
common/Cycles.cc
osdc/Striper.cc
osdc/Objecter.cc
common/Graylog.cc
${arch_files}
${auth_files}
${mds_files})
@ -369,7 +370,7 @@ endif(${WITH_LTTNG})
set(libglobal_srcs
global/global_init.cc
global/pidfile.cc
global/pidfile.cc
global/signal_handler.cc)
set(global_common_files
global/global_context.cc)
@ -379,7 +380,7 @@ add_library(global STATIC ${libglobal_srcs}
target_link_libraries(global common ${CMAKE_THREAD_LIBS_INIT} ${CRYPTO_LIBS}
${EXTRALIBS})
if(${WITH_LTTNG})
target_link_libraries(global lttng-ust dl)
target_link_libraries(global lttng-ust dl)
endif(${WITH_LTTNG})
if(${ENABLE_SHARED})
set_target_properties(global PROPERTIES
@ -457,7 +458,7 @@ add_executable(ceph-monstore-tool tools/ceph_monstore_tool.cc)
target_link_libraries(ceph-monstore-tool os global ${Boost_PROGRAM_OPTIONS_LIBRARY})
install(TARGETS ceph-monstore-tool DESTINATION bin)
add_executable(ceph-objectstore-tool
add_executable(ceph-objectstore-tool
tools/ceph_objectstore_tool.cc
tools/RadosDump.cc
$<TARGET_OBJECTS:common_util_obj>
@ -588,11 +589,11 @@ set(lib_mon_srcs
auth/cephx/CephxKeyServer.cc
auth/cephx/CephxServiceHandler.cc
auth/AuthServiceHandler.cc
${osd_mon_files} mon/Paxos.cc
${osd_mon_files} mon/Paxos.cc
mon/PaxosService.cc
mon/OSDMonitor.cc
mon/MDSMonitor.cc
mon/MonmapMonitor.cc
mon/MonmapMonitor.cc
mon/LogMonitor.cc
mon/AuthMonitor.cc
mon/Elector.cc
@ -662,14 +663,14 @@ endif(${HAVE_LIBFUSE})
# make rocksdb statically
add_custom_target(build_rocksdb
COMMAND
COMMAND
EXTRA_CXXFLAGS=-fPIC PORTABLE=1 make static_lib
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/rocksdb
COMMENT "rocksdb building")
# add a imported library for librocksdb.a
# add a imported library for librocksdb.a
add_library(rocksdb STATIC IMPORTED)
set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/src/rocksdb/librocksdb.a")
set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/src/rocksdb/librocksdb.a")
add_dependencies(rocksdb build_rocksdb)
set(ROCKSDB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/rocksdb/include)
@ -724,7 +725,7 @@ add_library(osd STATIC ${osd_srcs} $<TARGET_OBJECTS:osd_mon_objs>
$<TARGET_OBJECTS:cls_references_objs>)
target_link_libraries(osd dl leveldb)
if(${WITH_LTTNG})
target_link_libraries(osd libosd_tp)
target_link_libraries(osd libosd_tp)
endif(${WITH_LTTNG})
set(ceph_osd_srcs
@ -742,7 +743,7 @@ install(TARGETS ceph-osd DESTINATION bin)
# MDS
if(${WITH_MDS})
set(mds_srcs
set(mds_srcs
mds/Capability.cc
mds/MDSDaemon.cc
mds/MDSRank.cc
@ -806,7 +807,7 @@ target_link_libraries(cephfstool common ${EXTRALIBS})
set_target_properties(cephfstool PROPERTIES OUTPUT_NAME cephfs)
install(TARGETS cephfstool DESTINATION bin)
set(compressor_srcs
set(compressor_srcs
compressor/Compressor.cc
compressor/AsyncCompressor.cc)
add_library(compressor STATIC ${compressor_srcs})
@ -1076,7 +1077,7 @@ if(${WITH_RBD})
$<TARGET_OBJECTS:heap_profiler_objs>)
set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
target_link_libraries(rbd librbd librados global common keyutils udev
${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
install(TARGETS rbd DESTINATION bin)
install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/ceph-rbdnamer DESTINATION bin)
@ -1213,4 +1214,3 @@ add_custom_target(cephfs_testing DEPENDS
cephfs-journal-tool
cephfs-data-scan
cephfs-table-tool)