From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Jan 2016 14:20:46 +0000 (+0800)
Subject: cmake: fix the build on trusty
X-Git-Tag: v10.0.3~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7249%2Fhead;p=ceph.git

cmake: fix the build on trusty

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2c4cfda6242..60a299ccf646 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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})
diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
index 27773629add8..e24c60fb239c 100644
--- a/src/kv/CMakeLists.txt
+++ b/src/kv/CMakeLists.txt
@@ -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)