]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: move buffer_seastar.cc into libcrimson-common.a.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 22 Jun 2020 14:18:38 +0000 (16:18 +0200)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 23 Jun 2020 08:16:05 +0000 (10:16 +0200)
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<char>&&)'
  /work/ceph-2/src/mon/MonMap.cc:671: undefined reference to `ceph::buffer::v15_2_0::create(seastar::temporary_buffer<char>&&)'
  ```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/CMakeLists.txt

index 42a92c5ae59af3716b9a9cb34c40f43fb9339091..0d267288f157da129352eed920a213776f836962 100644 (file)
@@ -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