Merge branch 'wip-cmake-rbd-python' into wip-mgolub-testing

cmake: fix incorrect dependencies to librados #10145
ceph · Jul 6, 2016 · d8b39cf · d8b39cf
2 parents c3b3d6d + a21b3df
commit d8b39cf
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -544,15 +544,14 @@ add_library(librados_objs OBJECT
   librados/RadosClient.cc)
 add_library(librados ${CEPH_SHARED}
   librados/librados.cc
-  $<TARGET_OBJECTS:cls_references_objs>
   $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:librados_objs>)
 add_dependencies(librados osdc)
 if(WITH_LTTNG)
   add_dependencies(librados rados-tp)
 endif()
 # LINK_PRIVATE instead of PRIVATE is used to backward compatibility with cmake 2.8.11
-target_link_libraries(librados LINK_PRIVATE osdc osd os global common cls_lock_client
+target_link_libraries(librados LINK_PRIVATE osdc common cls_lock_client
   ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS})
 if(ENABLE_SHARED)
   set_target_properties(librados PROPERTIES