From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 23 Feb 2022 18:22:17 +0000 (-0800)
Subject: Merge pull request #44321 from Alexponomarev7/fix-static-librados-build
X-Git-Tag: v18.0.0~1344
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69e3bca571fb89e95b8def0de6a3325549992f1e;p=ceph.git

Merge pull request #44321 from Alexponomarev7/fix-static-librados-build

cmake: add ceph-common DENABLE_SHARED=OFF support

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

69e3bca571fb89e95b8def0de6a3325549992f1e
diff --cc src/CMakeLists.txt
index abace5f0b19a,62ef4012a626..64ccd21e4dfe
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -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