Skip to content

Commit

Permalink
Merge pull request #10145 from dillaman/wip-cmake-rbd-python
Browse files Browse the repository at this point in the history
cmake: fix incorrect dependencies to librados

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Jul 6, 2016
2 parents 0a0b0eb + a21b3df commit c70f120
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c70f120

Please sign in to comment.