RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 00:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: fix the build on trusty

Browse Source 
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-01-15 22:20:46 +08:00
parent 31034f6d74
commit 10335c507a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -616,7 +616,7 @@ set(ceph_mon_srcs
common/TextTable.cc)
add_executable(ceph-mon ${ceph_mon_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
add_dependencies(ceph-mon erasure_code_plugins)
target_link_libraries(ceph-mon mon ${Boost_THREAD_LIBRARY} common os global ${EXTRALIBS}
target_link_libraries(ceph-mon mon common os global ${EXTRALIBS}
${CMAKE_DL_LIBS} ${ALLOC_LIBS})
install(TARGETS ceph-mon DESTINATION bin)
@ -681,7 +681,7 @@ endif(${HAVE_LIBAIO})
if(${WITH_LTTNG})
target_link_libraries(os libos_tp)
endif(${WITH_LTTNG})
target_link_libraries(os kv leveldb snappy rocksdb)
target_link_libraries(os kv)
set(cls_references_files objclass/class_api.cc)
add_library(cls_references_objs OBJECT ${cls_references_files})

2
src/kv/CMakeLists.txt
View File

@ -6,7 +6,7 @@ add_library(kv_objs OBJECT ${kv_srcs})
add_library(kv STATIC $<TARGET_OBJECTS:kv_objs>)
target_include_directories(kv_objs PUBLIC ${ROCKSDB_INCLUDE_DIR})
target_include_directories(kv PUBLIC ${ROCKSDB_INCLUDE_DIR})
target_link_libraries(kv z leveldb snappy rocksdb)
target_link_libraries(kv leveldb rocksdb snappy z)
# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
find_package(BZip2 QUIET)