From: Radoslaw Zarzynski Date: Mon, 22 Jun 2020 14:18:38 +0000 (+0200) Subject: cmake: move buffer_seastar.cc into libcrimson-common.a. X-Git-Tag: v17.0.0~2001^2~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2dab54a03b1d7ad1b0ad849366fce5ad05c3b710;p=ceph.git cmake: move buffer_seastar.cc into libcrimson-common.a. Before the commit it was a part of libcrimson.a. However, this assignment misses the dependency MonMac.cc has towards it: ``` ../../../lib/libcrimson-common.a(MonMap.cc.o): In function `operator()': /work/ceph-2/src/mon/MonMap.cc:671: undefined reference to `ceph::buffer::v15_2_0::create(seastar::temporary_buffer&&)' /work/ceph-2/src/mon/MonMap.cc:671: undefined reference to `ceph::buffer::v15_2_0::create(seastar::temporary_buffer&&)' ``` Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt index 42a92c5ae59af..0d267288f157d 100644 --- a/src/crimson/CMakeLists.txt +++ b/src/crimson/CMakeLists.txt @@ -30,6 +30,7 @@ add_library(crimson-common STATIC ${PROJECT_SOURCE_DIR}/src/common/bit_str.cc ${PROJECT_SOURCE_DIR}/src/common/bloom_filter.cc ${PROJECT_SOURCE_DIR}/src/common/buffer.cc + ${PROJECT_SOURCE_DIR}/src/common/buffer_seastar.cc ${PROJECT_SOURCE_DIR}/src/common/ceph_argparse.cc ${PROJECT_SOURCE_DIR}/src/common/ceph_context.cc ${PROJECT_SOURCE_DIR}/src/common/ceph_crypto.cc @@ -172,8 +173,7 @@ add_library(crimson STATIC ${crimson_auth_srcs} ${crimson_mgr_srcs} ${crimson_mon_srcs} - ${crimson_net_srcs} - ${CMAKE_SOURCE_DIR}/src/common/buffer_seastar.cc) + ${crimson_net_srcs}) target_compile_options(crimson PUBLIC "-ftemplate-backtrace-limit=0") target_link_libraries(crimson