Merge pull request ceph#58414 from cbodley/wip-cmake-object-library-legacy-headers

cmake: more object libraries depend on legacy-option-headers

Reviewed-by: Kefu Chai <[email protected]>

Author: cbodley

src/compressor/CMakeLists.txt

@@ -8,6 +8,7 @@ if(HAVE_QATZIP AND HAVE_QAT)
                         QAT::qat
                         QAT::usdm
                         QAT::zip
+                        legacy-option-headers
                        )
 endif()
 

src/crush/CMakeLists.txt

@@ -9,3 +9,4 @@ set(crush_srcs
   CrushLocation.cc)
 
 add_library(crush_objs OBJECT ${crush_srcs})
+target_link_libraries(crush_objs PUBLIC legacy-option-headers)

src/erasure-code/jerasure/CMakeLists.txt

@@ -5,6 +5,7 @@ set(jerasure_utils_src
   ErasureCodeJerasure.cc)
 
 add_library(jerasure_utils OBJECT ${jerasure_utils_src})
+target_link_libraries(jerasure_utils legacy-option-headers)
 
 # Set the CFLAGS correctly for gf-complete based on SIMD compiler support
 set(GF_COMPILE_FLAGS)

src/mgr/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_library(mgr_cap_obj OBJECT
   MgrCap.cc)
+target_link_libraries(mgr_cap_obj legacy-option-headers)
 
 if(WITH_MGR)
   set(mgr_srcs

src/test/objectstore/CMakeLists.txt

@@ -6,7 +6,8 @@ install(TARGETS ceph_perf_objectstore
 
 add_library(store_test_fixture OBJECT store_test_fixture.cc)
 target_include_directories(store_test_fixture PRIVATE
-  $<TARGET_PROPERTY:GTest::GTest,INTERFACE_INCLUDE_DIRECTORIES>)
+  $<TARGET_PROPERTY:GTest::GTest,INTERFACE_INCLUDE_DIRECTORIES>
+  legacy-option-headers)
 
 add_executable(ceph_test_objectstore
   store_test.cc
@@ -140,11 +141,9 @@ if(WITH_BLUESTORE)
 endif()
 
 # fragmentation simulator
-add_library(ObjectStoreImitator OBJECT ObjectStoreImitator.cc)
-
 add_executable(ceph_test_fragmentation_sim
   Fragmentation_simulator.cc
-  $<TARGET_OBJECTS:ObjectStoreImitator>)
+  ObjectStoreImitator.cc)
 add_ceph_unittest(ceph_test_fragmentation_sim)
 target_link_libraries(ceph_test_fragmentation_sim os global)