]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #44321 from Alexponomarev7/fix-static-librados-build
authorYuri Weinstein <yweinste@redhat.com>
Wed, 23 Feb 2022 18:22:17 +0000 (10:22 -0800)
committerGitHub <noreply@github.com>
Wed, 23 Feb 2022 18:22:17 +0000 (10:22 -0800)
cmake: add ceph-common DENABLE_SHARED=OFF support

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/CMakeLists.txt

index abace5f0b19af7e443b83cb55623677cc32d8e14,62ef4012a6269586d333c82c596bc9547c0a552d..64ccd21e4dfe5a5ca9daf8a704e3f9c0676df9a3
@@@ -524,11 -544,11 +524,11 @@@ endif(
  
  add_library(common STATIC ${ceph_common_objs})
  target_link_libraries(common ${ceph_common_deps})
 -add_dependencies(common legacy-option-headers)
 +add_dependencies(common legacy-option-headers ${jaeger_base})
  
- add_library(ceph-common SHARED ${ceph_common_objs})
+ add_library(ceph-common ${CEPH_SHARED} ${ceph_common_objs})
  target_link_libraries(ceph-common ${ceph_common_deps})
 -add_dependencies(ceph-common legacy-option-headers)
 +add_dependencies(ceph-common legacy-option-headers ${jaeger_base})
  # appease dpkg-shlibdeps
  set_target_properties(ceph-common PROPERTIES
    SOVERSION 2