diff options
author | Jason Dillaman <dillaman@redhat.com> | 2019-02-03 17:28:37 +0100 |
---|---|---|
committer | Jason Dillaman <dillaman@redhat.com> | 2019-02-20 20:59:26 +0100 |
commit | 65c8733b56d2392ec70d6bf4db994697a4828287 (patch) | |
tree | 3329763790a307b7660bcd2da5ab275aa4f45c7f /src/tools/cephfs/CMakeLists.txt | |
parent | Merge pull request #26465 from dzafman/wip-38344 (diff) | |
download | ceph-65c8733b56d2392ec70d6bf4db994697a4828287.tar.xz ceph-65c8733b56d2392ec70d6bf4db994697a4828287.zip |
librados: revert librados3/libradoscc back to librados2
For backwards compatibility and upgrade reasons, the librados2
API needs to be preserved and it needs to continue to be compatible
with dependent libraries like librbd1.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/tools/cephfs/CMakeLists.txt')
-rw-r--r-- | src/tools/cephfs/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt index dbfc74e6a33..2cca8dc034c 100644 --- a/src/tools/cephfs/CMakeLists.txt +++ b/src/tools/cephfs/CMakeLists.txt @@ -9,7 +9,7 @@ set(cephfs_journal_tool_srcs RoleSelector.cc MDSUtility.cc) add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs}) -target_link_libraries(cephfs-journal-tool librados-cxx mds osdc global +target_link_libraries(cephfs-journal-tool librados mds osdc global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) set(cephfs_table_tool_srcs @@ -18,7 +18,7 @@ set(cephfs_table_tool_srcs RoleSelector.cc MDSUtility.cc) add_executable(cephfs-table-tool ${cephfs_table_tool_srcs}) -target_link_libraries(cephfs-table-tool librados-cxx mds osdc global +target_link_libraries(cephfs-table-tool librados mds osdc global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) set(cephfs_data_scan_srcs @@ -28,7 +28,7 @@ set(cephfs_data_scan_srcs PgFiles.cc MDSUtility.cc) add_executable(cephfs-data-scan ${cephfs_data_scan_srcs}) -target_link_libraries(cephfs-data-scan librados-cxx cephfs mds osdc global +target_link_libraries(cephfs-data-scan librados cephfs mds osdc global cls_cephfs_client ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |