From 652dbacc7424efbd3c3175de8ba79ed29edd55c8 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Mon, 31 Aug 2020 12:58:18 +0300 Subject: [PATCH] crimson/cmake: make libraries static to prevent cmake error Fixes: https://tracker.ceph.com/issues/47209 Signed-off-by: Yuval Lifshitz --- src/crimson/os/CMakeLists.txt | 2 +- src/crimson/os/cyanstore/CMakeLists.txt | 5 +++-- src/crimson/os/seastore/CMakeLists.txt | 6 ++++-- src/test/crimson/seastore/CMakeLists.txt | 16 ++++++++++++---- .../crimson/seastore/onode_tree/CMakeLists.txt | 4 +++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/crimson/os/CMakeLists.txt b/src/crimson/os/CMakeLists.txt index b5d1f93cd02..f221dd7c131 100644 --- a/src/crimson/os/CMakeLists.txt +++ b/src/crimson/os/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(crimson-os +add_library(crimson-os STATIC futurized_store.cc ${PROJECT_SOURCE_DIR}/src/os/Transaction.cc) add_subdirectory(cyanstore) diff --git a/src/crimson/os/cyanstore/CMakeLists.txt b/src/crimson/os/cyanstore/CMakeLists.txt index 24c3df40231..65f2b549885 100644 --- a/src/crimson/os/cyanstore/CMakeLists.txt +++ b/src/crimson/os/cyanstore/CMakeLists.txt @@ -1,6 +1,7 @@ -add_library(crimson-cyanstore +add_library(crimson-cyanstore STATIC cyan_store.cc cyan_collection.cc cyan_object.cc) target_link_libraries(crimson-cyanstore - crimson) + crimson + crimson-os) diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt index 9264b3b69e7..b0f53e38987 100644 --- a/src/crimson/os/seastore/CMakeLists.txt +++ b/src/crimson/os/seastore/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(crimson-seastore +add_library(crimson-seastore STATIC cached_extent.cc seastore_types.cc segment_manager/ephemeral.cc @@ -18,4 +18,6 @@ add_library(crimson-seastore ../../../test/crimson/seastore/test_block.cc ) target_link_libraries(crimson-seastore - crimson) + crimson + crimson-os) + diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt index e84a4d6171a..54d1faed0e1 100644 --- a/src/test/crimson/seastore/CMakeLists.txt +++ b/src/test/crimson/seastore/CMakeLists.txt @@ -6,7 +6,9 @@ add_ceph_unittest(unittest_transaction_manager) target_link_libraries( unittest_transaction_manager ${CMAKE_DL_LIBS} - crimson-seastore) + crimson-seastore + crimson-os + crimson-common) add_executable(unittest_btree_lba_manager test_btree_lba_manager.cc @@ -15,7 +17,9 @@ add_ceph_unittest(unittest_btree_lba_manager) target_link_libraries( unittest_btree_lba_manager ${CMAKE_DL_LIBS} - crimson-seastore) + crimson-seastore + crimson-os + crimson-common) add_executable(unittest_seastore_journal test_seastore_journal.cc) @@ -24,7 +28,9 @@ add_ceph_test(unittest_seastore_journal target_link_libraries( unittest_seastore_journal crimson::gtest - crimson-seastore) + crimson-seastore + crimson-os + crimson-common) add_executable(unittest_seastore_cache test_block.cc @@ -34,6 +40,8 @@ add_ceph_test(unittest_seastore_cache target_link_libraries( unittest_seastore_cache crimson::gtest - crimson-seastore) + crimson-seastore + crimson-os + crimson-common) add_subdirectory(onode_tree) diff --git a/src/test/crimson/seastore/onode_tree/CMakeLists.txt b/src/test/crimson/seastore/onode_tree/CMakeLists.txt index 2c799683a1a..4d6f414d9d0 100644 --- a/src/test/crimson/seastore/onode_tree/CMakeLists.txt +++ b/src/test/crimson/seastore/onode_tree/CMakeLists.txt @@ -3,4 +3,6 @@ add_executable(test-seastore-onode-tree-node add_ceph_unittest(test-seastore-onode-tree-node) target_link_libraries(test-seastore-onode-tree-node crimson-seastore - GTest::Main) + GTest::Main + crimson-os + crimson-common) -- 2.39.5