crimson/cmake: make libraries static to prevent cmake error

Fixes: https://tracker.ceph.com/issues/47209
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>

diff --git a/src/crimson/os/CMakeLists.txt b/src/crimson/os/CMakeLists.txt
index b5d1f93cd028a945003bf1126d6fd8d4f91f17dc..f221dd7c131a215053fae1599588c945da5fdaae 100644 (file)
--- 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 24c3df40231315aec9e61824a358616a54defed0..65f2b54988502e445650b3afd8196586e746f8d8 100644 (file)
--- 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 9264b3b69e76ea6ecfb0826c84f5a9134180bb81..b0f53e38987e53bd4b52caa904e8b43abbb098ce 100644 (file)
--- 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 e84a4d6171a2410b84e37c7b294b864a745e6364..54d1faed0e12dad69ad258926214e12c679adb2f 100644 (file)
--- 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 2c799683a1a052294966e5aaf88585ff21f71a36..4d6f414d9d04423a1370c104c034c99a2f8da729 100644 (file)
--- 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)