]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: reuse common_mountcephfs_objs in crimson-common
authorKefu Chai <kchai@redhat.com>
Wed, 17 Oct 2018 02:54:55 +0000 (10:54 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 17 Oct 2018 15:54:57 +0000 (23:54 +0800)
so we won't built them twice.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/CMakeLists.txt

index 519c1629840c391307483aa9ceec3586a5702f8b..f810ac5e85374ead400127cd03a34db60aff49a0 100644 (file)
@@ -12,10 +12,8 @@ set(crimson_common_srcs
 #  - the logging is sent to Seastar backend
 #  - and the template parameter of lock_policy is SINGLE
 add_library(crimson-common STATIC
-  ${PROJECT_SOURCE_DIR}/src/common/addr_parsing.c
   ${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc
   ${PROJECT_SOURCE_DIR}/src/common/admin_socket_client.cc
-  ${PROJECT_SOURCE_DIR}/src/common/armor.c
   ${PROJECT_SOURCE_DIR}/src/common/bit_str.cc
   ${PROJECT_SOURCE_DIR}/src/common/bloom_filter.cc
   ${PROJECT_SOURCE_DIR}/src/common/ceph_argparse.cc
@@ -50,7 +48,6 @@ add_library(crimson-common STATIC
   ${PROJECT_SOURCE_DIR}/src/common/perf_histogram.cc
   ${PROJECT_SOURCE_DIR}/src/common/page.cc
   ${PROJECT_SOURCE_DIR}/src/common/snap_types.cc
-  ${PROJECT_SOURCE_DIR}/src/common/safe_io.c
   ${PROJECT_SOURCE_DIR}/src/common/signal.cc
   ${PROJECT_SOURCE_DIR}/src/common/str_list.cc
   ${PROJECT_SOURCE_DIR}/src/common/str_map.cc
@@ -91,6 +88,7 @@ add_library(crimson-common STATIC
   ${crimson_common_srcs}
   $<TARGET_OBJECTS:crimson-auth>
   $<TARGET_OBJECTS:common_buffer_obj>
+  $<TARGET_OBJECTS:common_mountcephfs_objs>
   $<TARGET_OBJECTS:crimson-crush>
   $<TARGET_OBJECTS:global_common_objs>)