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/librados/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/librados/CMakeLists.txt')
| -rw-r--r-- | src/librados/CMakeLists.txt | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt index c2f68f648c1..c4df7531094 100644 --- a/src/librados/CMakeLists.txt +++ b/src/librados/CMakeLists.txt @@ -10,17 +10,16 @@ add_library(rados_c_api OBJECT librados_c.cc) add_library(rados_cxx_api OBJECT librados_cxx.cc) -add_library(rados_cxx STATIC - $<TARGET_OBJECTS:rados_cxx_api>) if(WITH_LTTNG) add_dependencies(librados_impl librados-tp) add_dependencies(rados_c_api librados-tp) add_dependencies(rados_cxx_api librados-tp) endif() -# C API +# C/C++ API add_library(librados ${CEPH_SHARED} - $<TARGET_OBJECTS:rados_c_api>) + $<TARGET_OBJECTS:rados_c_api> + $<TARGET_OBJECTS:rados_cxx_api>) if(ENABLE_SHARED) set_target_properties(librados PROPERTIES OUTPUT_NAME rados @@ -39,34 +38,11 @@ if(ENABLE_SHARED) endif() target_link_libraries(librados PRIVATE - rados_cxx librados_impl - osdc ceph-common cls_lock_client + librados_impl osdc ceph-common cls_lock_client ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS} ${GSSAPI_LIBRARIES}) target_link_libraries(librados ${rados_libs}) install(TARGETS librados DESTINATION ${CMAKE_INSTALL_LIBDIR}) -# C++ API -add_library(librados-cxx ${CEPH_SHARED} - $<TARGET_OBJECTS:rados_cxx_api>) -if(ENABLE_SHARED) - set_target_properties(librados-cxx PROPERTIES - OUTPUT_NAME radospp - VERSION 1.0.0 - SOVERSION 1 - CXX_VISIBILITY_PRESET hidden - VISIBILITY_INLINES_HIDDEN ON) - if(NOT APPLE) - set_property(TARGET librados-cxx APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,--exclude-libs,ALL") - endif() -endif(ENABLE_SHARED) -target_link_libraries(librados-cxx - PUBLIC - librados - PRIVATE - librados_impl cls_lock_client ceph-common) -install(TARGETS librados-cxx DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(WITH_LTTNG AND WITH_EVENTTRACE) add_dependencies(librados_api_obj eventtrace_tp) endif() |