From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 26 Jan 2017 15:59:36 +0000 (+0800)
Subject: Merge pull request #12878 from tchaikov/wip-cmake
X-Git-Tag: v12.0.0~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a86a3fd8566ef218820fa7f17edfd6ed73ba364;p=ceph.git

Merge pull request #12878 from tchaikov/wip-cmake

cmake: link ceph-{mgr,mon,mds,osd} against libcommon statically

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

8a86a3fd8566ef218820fa7f17edfd6ed73ba364
diff --cc src/CMakeLists.txt
index 0b75a5e17275,86c93e2ff0f9..d7cf3a2b57c1
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -563,20 -562,8 +562,11 @@@ set(ceph_common_dep
    ${Boost_IOSTREAMS_LIBRARY}
    ${BLKID_LIBRARIES} ${Backtrace_LIBRARIES}
    ${CRYPTO_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 +if(HAVE_RDMA)
 +  target_link_libraries(ceph-common ${RDMA_LIBRARY})
 +endif(HAVE_RDMA)
  if(NOT WITH_SYSTEM_BOOST)
-   target_link_libraries(ceph-common ${ZLIB_LIBRARIES})
- endif()
- install(TARGETS ceph-common DESTINATION ${CMAKE_INSTALL_PKGLIBDIR})
- if(WITH_EMBEDDED)
-   add_library(cephd_common STATIC
-     $<TARGET_OBJECTS:common_buffer_obj>
-     $<TARGET_OBJECTS:common_texttable_obj>
-     $<TARGET_OBJECTS:compressor_objs>
-     $<TARGET_OBJECTS:common-objs>
-     $<TARGET_OBJECTS:common_mountcephfs_objs>)
+   list(APPEND ceph_common_deps ${ZLIB_LIBRARIES})
  endif()
  
  set_source_files_properties(${CMAKE_SOURCE_DIR}/src/ceph_ver.c