cmake: simplified heap_profiler_objs dependencies

The heap_profiler object library only needs to be
added to mon,mds, and osd instead of the numerous
targets it is part of

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0eebf17aec4d25f56bdc5cb4eb62e26c1c1407c..f0673e7cdb0797502b6cec0181742ef3602c60ab 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -414,13 +414,11 @@ set(librados_srcs
   )
 add_library(librados ${CEPH_SHARED} ${librados_srcs}
   $<TARGET_OBJECTS:cls_references_objs>
-  $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:common_util_obj>)
 add_dependencies(librados osdc)
 # LINK_PRIVATE instead of PRIVATE is used to backward compatibility with cmake 2.8.11
 target_link_libraries(librados LINK_PRIVATE osdc osd os global common cls_lock_client
-  ${BLKID_LIBRARIES}
-  ${CRYPTO_LIBS} ${EXTRALIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS})
 if(${ENABLE_SHARED})
   set_target_properties(librados PROPERTIES OUTPUT_NAME rados VERSION 2.0.0
     SOVERSION 2)
@@ -464,8 +462,7 @@ install(TARGETS ceph-monstore-tool DESTINATION bin)
 add_executable(ceph-objectstore-tool
   tools/ceph_objectstore_tool.cc
   tools/RadosDump.cc
-  $<TARGET_OBJECTS:common_util_obj>
-  $<TARGET_OBJECTS:heap_profiler_objs>)
+  $<TARGET_OBJECTS:common_util_obj>)
 target_link_libraries(ceph-objectstore-tool tcmalloc osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} fuse dl)
 install(TARGETS ceph-objectstore-tool DESTINATION bin)
 
@@ -476,8 +473,8 @@ set(rados_srcs
   tools/rados/RadosImport.cc
   tools/rados/PoolDump.cc
   common/obj_bencher.cc)
-add_executable(rados ${rados_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
-target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} libradosstriper)
+add_executable(rados ${rados_srcs})
+target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} libradosstriper)
 
 if (WITH_CEPHFS)
   set(cephfs_journal_tool_srcs
@@ -489,38 +486,33 @@ if (WITH_CEPHFS)
     tools/cephfs/Dumper.cc
     tools/cephfs/Resetter.cc
     tools/cephfs/MDSUtility.cc)
-  add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs}
-                 $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs})
   target_link_libraries(cephfs-journal-tool librados mds osdc global
-                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
   set(cephfs_table_tool_srcs
     tools/cephfs/cephfs-table-tool.cc
     tools/cephfs/TableTool.cc
     tools/cephfs/MDSUtility.cc)
-  add_executable(cephfs-table-tool ${cephfs_table_tool_srcs}
-                 $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_executable(cephfs-table-tool ${cephfs_table_tool_srcs})
   target_link_libraries(cephfs-table-tool librados mds osdc global
-                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
   set(cephfs_data_scan_srcs
     tools/cephfs/cephfs-data-scan.cc
     tools/cephfs/DataScan.cc
     tools/cephfs/MDSUtility.cc)
-  add_executable(cephfs-data-scan ${cephfs_data_scan_srcs}
-                 $<TARGET_OBJECTS:heap_profiler_objs>)
-
+  add_executable(cephfs-data-scan ${cephfs_data_scan_srcs})
   target_link_libraries(cephfs-data-scan librados mds osdc global
                         cls_cephfs_client
-                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 endif (WITH_CEPHFS)
 
 set(librados_config_srcs
   librados-config.cc)
-add_executable(librados-config ${librados_config_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>)
-target_link_libraries(librados-config librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS})
+add_executable(librados-config ${librados_config_srcs})
+target_link_libraries(librados-config librados global ${BLKID_LIBRARIES}
+  ${CMAKE_DL_LIBS})
 
 install(TARGETS rados librados-config DESTINATION bin)
 
@@ -558,7 +550,7 @@ if(${WITH_RBD})
       rbd_replay_types)
 endif(${WITH_RBD})
 
-add_executable(ceph-dencoder ${dencoder_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+add_executable(ceph-dencoder ${dencoder_srcs})
 target_link_libraries(ceph-dencoder
   librados
   librbd
@@ -584,7 +576,6 @@ target_link_libraries(ceph-dencoder
   keyutils
   rbd_replay
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -613,15 +604,16 @@ set(common_util_src
 add_library(common_util_obj OBJECT ${common_util_src})
 add_library(mon STATIC ${lib_mon_srcs} $<TARGET_OBJECTS:mon_common_objs>
   $<TARGET_OBJECTS:kv_objs> $<TARGET_OBJECTS:osd_mon_objs>
-  $<TARGET_OBJECTS:common_util_obj>)
+  $<TARGET_OBJECTS:common_util_obj> $<TARGET_OBJECTS:heap_profiler_objs>)
+target_link_libraries(mon ${ALLOC_LIBS})
 
 set(ceph_mon_srcs
   ceph_mon.cc
   common/TextTable.cc)
-add_executable(ceph-mon ${ceph_mon_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+add_executable(ceph-mon ${ceph_mon_srcs})
 add_dependencies(ceph-mon erasure_code_plugins)
       target_link_libraries(ceph-mon mon common os global ${EXTRALIBS}
-  ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${CMAKE_DL_LIBS})
 install(TARGETS ceph-mon DESTINATION bin)
 
 # OSD
@@ -757,17 +749,16 @@ set(osd_mon_files
   mon/Monitor.cc)
 add_library(osd_mon_objs OBJECT ${osd_mon_files})
 add_library(osd STATIC ${osd_srcs} $<TARGET_OBJECTS:osd_mon_objs>
-  $<TARGET_OBJECTS:cls_references_objs>)
-target_link_libraries(osd dl leveldb)
+  $<TARGET_OBJECTS:cls_references_objs> $<TARGET_OBJECTS:heap_profiler_objs>)
+target_link_libraries(osd dl leveldb ${ALLOC_LIBS})
 
 set(ceph_osd_srcs
   ceph_osd.cc
   objclass/class_api.cc)
 add_executable(ceph-osd ${ceph_osd_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:common_util_obj>)
 add_dependencies(ceph-osd erasure_code_plugins)
-target_link_libraries(ceph-osd osd os global ${BLKID_LIBRARIES} ${ALLOC_LIBS})
+target_link_libraries(ceph-osd osd os global ${BLKID_LIBRARIES})
 if(${HAVE_LIBFUSE})
   target_link_libraries(ceph-osd ${FUSE_LIBRARIES})
 endif(${HAVE_LIBFUSE})
@@ -811,14 +802,15 @@ if(${WITH_MDS})
     mds/MDLog.cc
     ${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc
     ${CMAKE_SOURCE_DIR}/src/osdc/Journaler.cc)
-  add_library(mds ${mds_srcs})
+  add_library(mds ${mds_srcs}
+    $<TARGET_OBJECTS:heap_profiler_objs>)
+  target_link_libraries(mds ${ALLOC_LIBS})
   set(ceph_mds_srcs
     ceph_mds.cc)
   add_executable(ceph-mds ${ceph_mds_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     $<TARGET_OBJECTS:common_util_obj>)
   target_link_libraries(ceph-mds mds osdc ${CMAKE_DL_LIBS} global
-    ${ALLOC_LIBS} ${Boost_THREAD_LIBRARY})
+    ${Boost_THREAD_LIBRARY})
   install(TARGETS ceph-mds DESTINATION bin)
 endif(${WITH_MDS})
 
@@ -846,7 +838,7 @@ add_library(compressor STATIC ${compressor_srcs})
 target_link_libraries(compressor common snappy)
 
 add_executable(ceph-client-debug tools/ceph-client-debug.cc)
-target_link_libraries(ceph-client-debug cephfs librados global common ${ALLOC_LIBS})
+target_link_libraries(ceph-client-debug cephfs librados global common)
 install(TARGETS ceph-client-debug DESTINATION bin/debug)
 
 add_executable(ceph-kvstore-tool tools/ceph_kvstore_tool.cc)
@@ -941,11 +933,10 @@ if(WITH_LIBCEPHFS)
   set(libcephfs_srcs libcephfs.cc)
   add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs}
     $<TARGET_OBJECTS:cls_references_objs>
-    $<TARGET_OBJECTS:heap_profiler_objs>
     $<TARGET_OBJECTS:common_util_obj>)
   target_link_libraries(cephfs LINK_PRIVATE client osdc osd os global common cls_lock_client
     ${BLKID_LIBRARIES}
-    ${CRYPTO_LIBS} ${EXTRALIBS} ${ALLOC_LIBS})
+    ${CRYPTO_LIBS} ${EXTRALIBS})
 if(${ENABLE_SHARED})
   set_target_properties(cephfs PROPERTIES OUTPUT_NAME cephfs VERSION 1.0.0
     SOVERSION 1)
@@ -1104,12 +1095,11 @@ if(${WITH_RBD})
     tools/rbd/action/Watch.cc
     common/TextTable.cc)
   add_executable(rbd ${rbd_srcs} $<TARGET_OBJECTS:common_util_obj>
-    $<TARGET_OBJECTS:parse_secret_objs>
-    $<TARGET_OBJECTS:heap_profiler_objs>)
+    $<TARGET_OBJECTS:parse_secret_objs>)
   set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
   target_link_libraries(rbd librbd librados global common keyutils udev
     ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+    ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
   install(TARGETS rbd DESTINATION bin)
   install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/ceph-rbdnamer DESTINATION bin)
   install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/rbdmap DESTINATION bin)
@@ -1231,7 +1221,7 @@ if(${WITH_RADOSGW})
     rgw/rgw_file.cc
     )
 
-  add_library(rgw SHARED ${librgw_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_library(rgw SHARED ${librgw_srcs})
   target_link_libraries(rgw PRIVATE
     rgw_a
     librados
@@ -1245,8 +1235,7 @@ if(${WITH_RADOSGW})
     cls_replica_log_client
     cls_user_client
     curl expat global
-    resolv
-    ${TCMALLOC_LIBS})
+    resolv)
   set_target_properties(rgw PROPERTIES OUTPUT_NAME rgw VERSION 2.0.0
     SOVERSION 1)
 
@@ -1256,30 +1245,29 @@ if(${WITH_RADOSGW})
     include/rados/rgw_file.h
   DESTINATION include/rados)
 
-  add_executable(radosgw ${radosgw_srcs}  $<TARGET_OBJECTS:civetweb_common_objs>
-                $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_executable(radosgw ${radosgw_srcs}  $<TARGET_OBJECTS:civetweb_common_objs>)
   target_link_libraries(radosgw rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
     cls_log_client cls_statelog_client cls_timeindex_client
     cls_version_client cls_replica_log_client cls_user_client
-    curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES} ${ALLOC_LIBS})
+    curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES})
   install(TARGETS radosgw DESTINATION bin)
 
-  add_executable(radosgw-admin ${radosgw_admin_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_executable(radosgw-admin ${radosgw_admin_srcs})
   target_link_libraries(radosgw-admin rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
     cls_log_client cls_statelog_client cls_timeindex_client
     cls_version_client cls_replica_log_client cls_user_client
-    curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES} ${ALLOC_LIBS})
+    curl expat global fcgi resolv ssl crypto ${BLKID_LIBRARIES})
 
   install(TARGETS radosgw-admin DESTINATION bin)
 
-  add_executable(radosgw-object-expirer ${radosgw_object_expirer_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+  add_executable(radosgw-object-expirer ${radosgw_object_expirer_srcs})
   target_link_libraries(radosgw-object-expirer rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
     cls_log_client cls_statelog_client cls_timeindex_client
     cls_version_client cls_replica_log_client cls_user_client
-    curl expat global fcgi resolv ${ALLOC_LIBS})
+    curl expat global fcgi resolv)
   install(TARGETS radosgw-object-expirer DESTINATION bin)
 endif(${WITH_RADOSGW})
 

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 05eb52b8391689504d21b079bbf30cdb425c38f7..895437cc880651132841c736bc3dd95974135f73 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,22 +1,18 @@
 # test_timers
 add_executable(test_timers
   TestTimers.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(test_timers global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+target_link_libraries(test_timers global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_signal_handlers
 add_executable(test_signal_handlers
   TestSignalHandlers.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(test_signal_handlers global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS})
+target_link_libraries(test_signal_handlers global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_crypt
 add_executable(test_crypto
   testcrypto.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_crypto
   global
@@ -25,7 +21,6 @@ target_link_libraries(test_crypto
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   )
 
 add_executable(test_build_libcommon buildtest_skeleton.cc)
@@ -36,17 +31,16 @@ target_link_libraries(test_build_librgw rgw_a global pthread ${CRYPTO_LIBS} ${EX
 
 # From src/test/Makefile-client.am: I dont get this one... testing the osdc build but link in libcephfs?
 add_executable(test_build_libcephfs buildtest_skeleton.cc)
-target_link_libraries(test_build_libcephfs cephfs expat pthread ${CRYPTO_LIBS} ${EXTRALIBS} ${ALLOC_LIBS})
+target_link_libraries(test_build_libcephfs cephfs expat pthread ${CRYPTO_LIBS} ${EXTRALIBS})
 
 add_executable(test_build_librados buildtest_skeleton.cc)
-target_link_libraries(test_build_librados librados pthread ${CRYPTO_LIBS} ${EXTRALIBS} osdc osd os common cls_lock_client ${BLKID_LIBRARIES} ${ALLOC_LIBS})
+target_link_libraries(test_build_librados librados pthread ${CRYPTO_LIBS} ${EXTRALIBS} osdc osd os common cls_lock_client ${BLKID_LIBRARIES})
 
 # test_rados
 add_executable(test_rados 
   osd/TestRados.cc
   osd/TestOpStat.cc
   osd/Object.cc osd/RadosModel.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados
   librados
@@ -54,48 +48,40 @@ target_link_libraries(test_rados
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   )
 
 # test_mutate
 add_executable(test_mutate
   test_mutate.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_mutate global librados ${BLKID_LIBRARIES}
-  ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${CMAKE_DL_LIBS})
 
 # test_rewrite_latency
 add_executable(test_rewrite_latency
   test_rewrite_latency.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rewrite_latency common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_THREAD_LIBS_INIT} ${CRYPTO_LIBS} m ${EXTRALIBS})
 
 # test_trans
 add_executable(test_trans
   test_trans.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(test_trans os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+target_link_libraries(test_trans os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_keys
 add_executable(test_keys
   testkeys.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(test_keys mon global ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+target_link_libraries(test_keys mon global ${CMAKE_DL_LIBS})
 
 # get_command_descriptions
 add_executable(get_command_descriptions
   common/get_command_descriptions.cc
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(get_command_descriptions
   mon
@@ -103,7 +89,6 @@ target_link_libraries(get_command_descriptions
   leveldb
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -118,10 +103,9 @@ set(smalliobench_srcs
   )
 add_executable(smalliobench
   ${smalliobench_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(smalliobench librados ${Boost_PROGRAM_OPTIONS_LIBRARY} global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # smalliobenchfs
 set(smalliobenchfs_srcs
@@ -132,10 +116,9 @@ set(smalliobenchfs_srcs
   )
 add_executable(smalliobenchfs
   ${smalliobenchfs_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(smalliobenchfs librados ${Boost_PROGRAM_OPTIONS_LIBRARY} os global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # smalliobenchdumb
 set(smalliobenchdumb_srcs
@@ -146,10 +129,9 @@ set(smalliobenchdumb_srcs
   )
 add_executable(smalliobenchdumb
   ${smalliobenchdumb_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(smalliobenchdumb librados ${Boost_PROGRAM_OPTIONS_LIBRARY} os global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # smalliobenchrbd
 if (${WITH_RBD})
@@ -163,7 +145,6 @@ if (${WITH_RBD})
   )
   add_executable(smalliobenchrbd
     ${smalliobenchrbd_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(smalliobenchrbd
     librbd
@@ -174,7 +155,6 @@ if (${WITH_RBD})
     udev
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS}
     keyutils
     )
 endif (${WITH_RBD})
@@ -185,10 +165,9 @@ set(tpbench_srcs
   bench/detailed_stat_collector.cc)
 add_executable(tpbench
   ${tpbench_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(tpbench librados ${Boost_PROGRAM_OPTIONS_LIBRARY} global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # omapbench
 set(omapbench_srcs
@@ -196,7 +175,6 @@ set(omapbench_srcs
   )
 add_executable(omapbench
   ${omapbench_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(omapbench
   librados
@@ -204,7 +182,6 @@ target_link_libraries(omapbench
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   )
 
 # kvstorebench
@@ -214,15 +191,12 @@ set(kvstorebench_srcs
   )
 add_executable(kvstorebench
   ${kvstorebench_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(kvstorebench librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS})
+target_link_libraries(kvstorebench librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # ceph_objectstore_bench
-add_executable(ceph_objectstore_bench objectstore_bench.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>)
-target_link_libraries(ceph_objectstore_bench global ${BLKID_LIBRARIES} os ${ALLOC_LIBS})
+add_executable(ceph_objectstore_bench objectstore_bench.cc)
+target_link_libraries(ceph_objectstore_bench global ${BLKID_LIBRARIES} os)
 
 ## System tests
 
@@ -240,19 +214,17 @@ add_library(systest STATIC ${libsystest_srcs})
 # test_rados_list_parallel
 add_executable(test_rados_list_parallel
   system/rados_list_parallel.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados_list_parallel librados systest global pthread
-  rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_rados_open_pools_parallel
 set(test_rados_open_pools_parallel_srcs system/rados_open_pools_parallel.cc)
 add_executable(test_rados_open_pools_parallel
   ${test_rados_open_pools_parallel_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados_open_pools_parallel librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_rados_delete_pools_parallel
 set(test_rados_delete_pools_parallel_srcs
@@ -264,10 +236,9 @@ set(test_rados_delete_pools_parallel_srcs
   )
 add_executable(test_rados_delete_pools_parallel
   ${test_rados_delete_pools_parallel_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados_delete_pools_parallel librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # test_rados_watch_notify
 set(test_rados_watch_notify_srcs
@@ -280,10 +251,9 @@ set(test_rados_watch_notify_srcs
   )
 add_executable(test_rados_watch_notify
   ${test_rados_watch_notify_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados_watch_notify librados systest global
-  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 # bench_log
 set(bench_log_srcs
@@ -291,9 +261,8 @@ set(bench_log_srcs
   )
 add_executable(bench_log
   ${bench_log_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
-target_link_libraries(bench_log global pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+target_link_libraries(bench_log global pthread rt ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 ## Unit tests
 #make check starts here
@@ -364,19 +333,16 @@ add_dependencies(check ceph_disk)
 # unittest_admin_socket
 add_executable(unittest_admin_socket EXCLUDE_FROM_ALL
   admin_socket.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_admin_socket unittest_admin_socket)
 add_dependencies(check unittest_admin_socket)
-target_link_libraries(unittest_admin_socket global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(unittest_admin_socket global ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_admin_socket PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_blkdev
 add_executable(unittest_blkdev EXCLUDE_FROM_ALL
   common/test_blkdev.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(NAME unittest_blkdev COMMAND ./unittest_blkdev WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src)
 add_dependencies(check unittest_blkdev)
@@ -384,7 +350,6 @@ target_link_libraries(unittest_blkdev
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_blkdev PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -392,7 +357,6 @@ set_target_properties(unittest_blkdev PROPERTIES COMPILE_FLAGS
 # unittest_chain_xattr
 add_executable(unittest_chain_xattr EXCLUDE_FROM_ALL
   objectstore/chain_xattr.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_chain_xattr unittest_chain_xattr) 
 add_dependencies(check unittest_chain_xattr)
@@ -400,7 +364,6 @@ target_link_libraries(unittest_chain_xattr
   os
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
 set_target_properties(unittest_chain_xattr PROPERTIES COMPILE_FLAGS
@@ -461,83 +424,76 @@ add_dependencies(check encode_decode_non_regression)
 # unittest_encoding
 add_executable(unittest_encoding EXCLUDE_FROM_ALL
   encoding.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_encoding unittest_encoding)
 add_dependencies(check unittest_encoding)
-target_link_libraries(unittest_encoding cephfs librados pthread rt m ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(unittest_encoding cephfs librados pthread rt m ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_encoding
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_addrs
 add_executable(unittest_addrs EXCLUDE_FROM_ALL
   test_addrs.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_addrs unittest_addrs)
 add_dependencies(check unittest_addrs)
 target_link_libraries(unittest_addrs cephfs librados pthread rt m
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_addrs
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_bloom_filter
 add_executable(unittest_bloom_filter EXCLUDE_FROM_ALL
   common/test_bloom_filter.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_bloom_filter unittest_bloom_filter)
 add_dependencies(check unittest_bloom_filter)
 target_link_libraries(unittest_bloom_filter global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_bloom_filter
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_histogram
 add_executable(unittest_histogram EXCLUDE_FROM_ALL
   common/histogram.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_histogram unittest_histogram)
 add_dependencies(check unittest_histogram)
 target_link_libraries(unittest_histogram global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_histogram
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_prioritized_queue
 add_executable(unittest_prioritized_queue EXCLUDE_FROM_ALL
   common/test_prioritized_queue.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_prioritized_queue unittest_prioritized_queue)
 add_dependencies(check unittest_prioritized_queue)
 target_link_libraries(unittest_prioritized_queue global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_prioritized_queue
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_weighted_priority_queue
 add_executable(unittest_weighted_priority_queue EXCLUDE_FROM_ALL
   common/test_weighted_priority_queue.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_weighted_priority_queue unittest_weighted_priority_queue)
 add_dependencies(check unittest_weighted_priority_queue)
 target_link_libraries(unittest_weighted_priority_queue global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_weighted_priority_queue
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_str_map
 add_executable(unittest_str_map EXCLUDE_FROM_ALL
   common/test_str_map.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_str_map unittest_str_map)
 add_dependencies(check unittest_str_map)
 target_link_libraries(unittest_str_map common global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} common)
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS} common)
 set_target_properties(unittest_str_map
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
@@ -547,12 +503,11 @@ set(unittest_mutex_debug_srcs
   )
 add_executable(unittest_mutex_debug EXCLUDE_FROM_ALL
   ${unittest_mutex_debug_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mutex_debug unittest_mutex_debug)
 add_dependencies(check unittest_mutex_debug)
 target_link_libraries(unittest_mutex_debug global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
 set_target_properties(unittest_mutex_debug
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
@@ -562,48 +517,44 @@ set(unittest_shunique_lock_srcs
   )
 add_executable(unittest_shunique_lock EXCLUDE_FROM_ALL
   ${unittest_shunique_lock_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_shunique_lock unittest_shunique_lock)
 add_dependencies(check unittest_shunique_lock)
 target_link_libraries(unittest_shunique_lock global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS} ${EXTRALIBS})
 set_target_properties(unittest_shunique_lock
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_sharedptr_registry
 add_executable(unittest_sharedptr_registry EXCLUDE_FROM_ALL
   common/test_sharedptr_registry.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_sharedptr_registry unittest_sharedptr_registry)
 add_dependencies(check unittest_sharedptr_registry)
 target_link_libraries(unittest_sharedptr_registry global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_sharedptr_registry
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_shared_cache
 add_executable(unittest_shared_cache EXCLUDE_FROM_ALL
   common/test_shared_cache.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_shared_cache unittest_shared_cache)
 add_dependencies(check unittest_shared_cache)
 target_link_libraries(unittest_shared_cache global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_shared_cache
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_sloppy_crc_map
 add_executable(unittest_sloppy_crc_map EXCLUDE_FROM_ALL
   common/test_sloppy_crc_map.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_sloppy_crc_map unittest_sloppy_crc_map)
 add_dependencies(check unittest_sloppy_crc_map)
 target_link_libraries(unittest_sloppy_crc_map global
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_sloppy_crc_map
   PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
@@ -614,13 +565,11 @@ set(unittest_time_srcs
   )
 add_executable(unittest_time
   ${unittest_time_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(unittest_time
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
 set_target_properties(unittest_time
@@ -630,7 +579,6 @@ set_target_properties(unittest_time
 add_executable(unittest_util EXCLUDE_FROM_ALL
   common/test_util.cc
   ${CMAKE_SOURCE_DIR}/src/common/util.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_util unittest_util)
 add_dependencies(check unittest_util)
@@ -638,7 +586,6 @@ target_link_libraries(unittest_util
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
 set_target_properties(unittest_util
@@ -647,11 +594,10 @@ set_target_properties(unittest_util
 # unittest_crush_wrapper
 add_executable(unittest_crush_wrapper EXCLUDE_FROM_ALL
   crush/CrushWrapper.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_crush_wrapper unittest_crush_wrapper)
 add_dependencies(check unittest_crush_wrapper)
-target_link_libraries(unittest_crush_wrapper global crush ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_crush_wrapper global crush ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_crush_wrapper PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -659,11 +605,10 @@ set_target_properties(unittest_crush_wrapper PROPERTIES COMPILE_FLAGS
 # unittest_crush
 add_executable(unittest_crush EXCLUDE_FROM_ALL
   crush/crush.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_crush unittest_crush)
 add_dependencies(check unittest_crush)
-target_link_libraries(unittest_crush global m ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_crush global m ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS} ${EXTRALIBS})
 set_target_properties(unittest_crush PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -671,11 +616,10 @@ set_target_properties(unittest_crush PROPERTIES COMPILE_FLAGS
 # unittest_osdmap
 add_executable(unittest_osdmap EXCLUDE_FROM_ALL
   osd/TestOSDMap.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_osdmap unittest_osdmap)
 add_dependencies(check unittest_osdmap)
-target_link_libraries(unittest_osdmap global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_osdmap global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_osdmap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -683,12 +627,11 @@ set_target_properties(unittest_osdmap PROPERTIES COMPILE_FLAGS
 # unittest_workqueue
 add_executable(unittest_workqueue EXCLUDE_FROM_ALL
   test_workqueue.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_workqueue unittest_workqueue)
 add_dependencies(check unittest_workqueue)
 target_link_libraries(unittest_workqueue global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_workqueue PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -696,11 +639,10 @@ set_target_properties(unittest_workqueue PROPERTIES COMPILE_FLAGS
 # unittest_striper
 add_executable(unittest_striper EXCLUDE_FROM_ALL
   test_striper.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_striper unittest_striper)
 add_dependencies(check unittest_striper)
-target_link_libraries(unittest_striper global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} 
+target_link_libraries(unittest_striper global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_striper PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -708,35 +650,32 @@ set_target_properties(unittest_striper PROPERTIES COMPILE_FLAGS
 # unittest_prebufferedstreambuf
 add_executable(unittest_prebufferedstreambuf EXCLUDE_FROM_ALL
   test_prebufferedstreambuf.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_prebufferedstreambuf unittest_prebufferedstreambuf)
 add_dependencies(check unittest_prebufferedstreambuf)
 target_link_libraries(unittest_prebufferedstreambuf global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_prebufferedstreambuf PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_str_list
 add_executable(unittest_str_list EXCLUDE_FROM_ALL
   test_str_list.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_str_list unittest_str_list)
 add_dependencies(check unittest_str_list)
 target_link_libraries(unittest_str_list global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_str_list PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_log
 add_executable(unittest_log EXCLUDE_FROM_ALL
   ${CMAKE_SOURCE_DIR}/src/log/test.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_log unittest_log)
 add_dependencies(check unittest_log)
-target_link_libraries(unittest_log global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_log global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_log PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -744,104 +683,95 @@ set_target_properties(unittest_log PROPERTIES COMPILE_FLAGS
 # unittest_throttle
 add_executable(unittest_throttle EXCLUDE_FROM_ALL
   common/Throttle.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_throttle unittest_throttle)
 add_dependencies(check unittest_throttle)
 target_link_libraries(unittest_throttle global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_throttle PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_base64
 add_executable(unittest_base64 EXCLUDE_FROM_ALL
   base64.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_base64 unittest_base64)
 add_dependencies(check unittest_base64)
-target_link_libraries(unittest_base64 global ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(unittest_base64 global ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 set_target_properties(unittest_base64 PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_ceph_argparse
 add_executable(unittest_ceph_argparse EXCLUDE_FROM_ALL
   ceph_argparse.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_ceph_argparse unittest_ceph_argparse)
 add_dependencies(check unittest_ceph_argparse)
 target_link_libraries(unittest_ceph_argparse global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_ceph_argparse PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_ceph_compatset
 add_executable(unittest_ceph_compatset EXCLUDE_FROM_ALL
   ceph_compatset.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_ceph_compatset unittest_ceph_compatset)
 add_dependencies(check unittest_ceph_compatset)
 target_link_libraries(unittest_ceph_compatset global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_ceph_compatset PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_mds_types
 add_executable(unittest_mds_types EXCLUDE_FROM_ALL
   fs/mds_types.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mds_types unittest_mds_types)
 add_dependencies(check unittest_mds_types)
 target_link_libraries(unittest_mds_types global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_mds_types PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_osd_types
 add_executable(unittest_osd_types EXCLUDE_FROM_ALL
   osd/types.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_osd_types unittest_osd_types)
 add_dependencies(check unittest_osd_types)
 target_link_libraries(unittest_osd_types global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_osd_types PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_lru
 add_executable(unittest_lru EXCLUDE_FROM_ALL
   common/test_lru.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_lru unittest_lru)
 add_dependencies(check unittest_lru)
 target_link_libraries(unittest_lru global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_lru PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_io_priority
 add_executable(unittest_io_priority EXCLUDE_FROM_ALL
   common/test_io_priority.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_io_priority unittest_io_priority)
 add_dependencies(check unittest_io_priority)
 target_link_libraries(unittest_io_priority global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_io_priority PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_gather
 add_executable(unittest_gather EXCLUDE_FROM_ALL
   gather.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_gather unittest_gather)
 add_dependencies(check unittest_gather)
-target_link_libraries(unittest_gather global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_gather global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_gather PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -849,11 +779,10 @@ set_target_properties(unittest_gather PROPERTIES COMPILE_FLAGS
 # run_cmd
 add_executable(unittest_run_cmd EXCLUDE_FROM_ALL
   run_cmd.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_run_cmd unittest_run_cmd)
 add_dependencies(check unittest_run_cmd)
-target_link_libraries(unittest_run_cmd global ${CMAKE_DL_LIBS} ${ALLOC_LIBS} 
+target_link_libraries(unittest_run_cmd global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_run_cmd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -861,11 +790,10 @@ set_target_properties(unittest_run_cmd PROPERTIES COMPILE_FLAGS
 # signals
 add_executable(unittest_signals EXCLUDE_FROM_ALL
   signals.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_signals unittest_signals)
 add_dependencies(check unittest_signals)
-target_link_libraries(unittest_signals global ${CMAKE_DL_LIBS} ${ALLOC_LIBS} 
+target_link_libraries(unittest_signals global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_signals PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -873,43 +801,39 @@ set_target_properties(unittest_signals PROPERTIES COMPILE_FLAGS
 # unittest_simple_spin
 add_executable(unittest_simple_spin EXCLUDE_FROM_ALL
   simple_spin.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_simple_spin unittest_simple_spin)
 add_dependencies(check unittest_simple_spin)
 target_link_libraries(unittest_simple_spin global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_simple_spin PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_bufferlist
 add_executable(unittest_bufferlist EXCLUDE_FROM_ALL
   bufferlist.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_bufferlist unittest_bufferlist)
 add_dependencies(check unittest_bufferlist)
 target_link_libraries(unittest_bufferlist global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_bufferlist PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_xlist
 add_executable(unittest_xlist EXCLUDE_FROM_ALL
   test_xlist.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_xlist unittest_xlist)
 add_dependencies(check unittest_xlist)
 target_link_libraries(unittest_xlist common ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_xlist PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_librados
 add_executable(unittest_librados EXCLUDE_FROM_ALL
   librados/librados.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_librados unittest_librados)
 add_dependencies(check unittest_librados)
@@ -918,7 +842,6 @@ target_link_libraries(unittest_librados
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
 set_target_properties(unittest_librados PROPERTIES COMPILE_FLAGS
@@ -927,7 +850,6 @@ set_target_properties(unittest_librados PROPERTIES COMPILE_FLAGS
 # unittest_crc32c
 add_executable(unittest_crc32c EXCLUDE_FROM_ALL
   common/test_crc32c.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_crc32c unittest_crc32c)
 add_dependencies(check unittest_crc32c)
@@ -939,7 +861,6 @@ set_target_properties(unittest_crc32c PROPERTIES COMPILE_FLAGS
 # unittest_arch
 add_executable(unittest_arch EXCLUDE_FROM_ALL
   test_arch.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_arch unittest_arch)
 add_dependencies(check unittest_arch)
@@ -951,59 +872,54 @@ set_target_properties(unittest_arch PROPERTIES COMPILE_FLAGS
 # unittest_crypto
 add_executable(unittest_crypto
   crypto.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_crypto unittest_crypto)
 add_dependencies(check unittest_crypto)
-target_link_libraries(unittest_crypto global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(unittest_crypto global ${CMAKE_DL_LIBS} 
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_crypto PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_crypto_init
 add_executable(unittest_crypto_init EXCLUDE_FROM_ALL
   crypto_init.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_crypto_init unittest_crypto_init)
 add_dependencies(check unittest_crypto_init)
 target_link_libraries(unittest_crypto_init global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_crypto_init PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_perf_counters
 add_executable(unittest_perf_counters EXCLUDE_FROM_ALL
   perf_counters.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_perf_counters unittest_perf_counters)
 add_dependencies(check unittest_perf_counters)
 target_link_libraries(unittest_perf_counters global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_perf_counters PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_ceph_crypto
 add_executable(unittest_ceph_crypto EXCLUDE_FROM_ALL
   ceph_crypto.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_ceph_crypto unittest_ceph_crypto)
 add_dependencies(check unittest_ceph_crypto)
 target_link_libraries(unittest_ceph_crypto global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_ceph_crypto PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_utf8
 add_executable(unittest_utf8 EXCLUDE_FROM_ALL
   utf8.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_utf8 unittest_utf8)
 add_dependencies(check unittest_utf8)
-target_link_libraries(unittest_utf8 global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_utf8 global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_utf8 PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1011,11 +927,10 @@ set_target_properties(unittest_utf8 PROPERTIES COMPILE_FLAGS
 # unittest_mime
 add_executable(unittest_mime EXCLUDE_FROM_ALL
   mime.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mime unittest_mime)
 add_dependencies(check unittest_mime)
-target_link_libraries(unittest_mime global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_mime global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_mime PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1023,11 +938,10 @@ set_target_properties(unittest_mime PROPERTIES COMPILE_FLAGS
 # unittest_escape
 add_executable(unittest_escape EXCLUDE_FROM_ALL
   escape.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_escape unittest_escape)
 add_dependencies(check unittest_escape)
-target_link_libraries(unittest_escape global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_escape global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_escape PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1035,11 +949,10 @@ set_target_properties(unittest_escape PROPERTIES COMPILE_FLAGS
 # unittest_strtol
 add_executable(unittest_strtol EXCLUDE_FROM_ALL
   strtol.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_strtol unittest_strtol)
 add_dependencies(check unittest_strtol)
-target_link_libraries(unittest_strtol global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_strtol global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_strtol PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1047,23 +960,21 @@ set_target_properties(unittest_strtol PROPERTIES COMPILE_FLAGS
 # unittest_confutils
 add_executable(unittest_confutils EXCLUDE_FROM_ALL
   confutils.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_confutils unittest_confutils)
 add_dependencies(check unittest_confutils)
 target_link_libraries(unittest_confutils global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_confutils PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_config
 add_executable(unittest_config EXCLUDE_FROM_ALL
   common/test_config.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_config unittest_config)
 add_dependencies(check unittest_config)
-target_link_libraries(unittest_config global ${CMAKE_DL_LIBS} ${ALLOC_LIBS}
+target_link_libraries(unittest_config global ${CMAKE_DL_LIBS} 
   ${UNITTEST_LIBS})
 set_target_properties(unittest_config PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1071,36 +982,33 @@ set_target_properties(unittest_config PROPERTIES COMPILE_FLAGS
 # unittest_context
 add_executable(unittest_context EXCLUDE_FROM_ALL
   common/test_context.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_context unittest_context)
 add_dependencies(check unittest_context)
 target_link_libraries(unittest_context global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_context PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_safe_io
 add_executable(unittest_safe_io EXCLUDE_FROM_ALL
   common/test_safe_io.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_safe_io unittest_safe_io)
 add_dependencies(check unittest_safe_io)
 target_link_libraries(unittest_safe_io global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_safe_io PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_heartbeatmap
 add_executable(unittest_heartbeatmap EXCLUDE_FROM_ALL
   heartbeat_map.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_heartbeatmap unittest_heartbeatmap)
 add_dependencies(check unittest_heartbeatmap)
 target_link_libraries(unittest_heartbeatmap global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_heartbeatmap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -1109,12 +1017,11 @@ if(${WITH_RADOSGW})
   # why does this include rgw/rgw_formats.cc...?
   add_executable(unittest_formatter EXCLUDE_FROM_ALL
     ${CMAKE_SOURCE_DIR}/src/rgw/rgw_formats.cc
-    $<TARGET_OBJECTS:heap_profiler_objs>
   )
   add_test(unittest_formatter unittest_formatter)
   add_dependencies(check unittest_formatter)
   target_link_libraries(unittest_formatter global ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS} ${UNITTEST_LIBS})
+    ${UNITTEST_LIBS})
   set_target_properties(unittest_formatter PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
 endif(${WITH_RADOSGW})
@@ -1122,7 +1029,6 @@ endif(${WITH_RADOSGW})
 # unittest_daemon_config
 add_executable(unittest_daemon_config EXCLUDE_FROM_ALL
   daemon_config.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_daemon_config unittest_daemon_config)
 add_dependencies(check unittest_daemon_config)
@@ -1132,7 +1038,6 @@ target_link_libraries(unittest_daemon_config
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${EXTRALIBS}
   )
 set_target_properties(unittest_daemon_config PROPERTIES COMPILE_FLAGS
@@ -1141,24 +1046,22 @@ set_target_properties(unittest_daemon_config PROPERTIES COMPILE_FLAGS
 # unittest_libcephfs_config
 add_executable(unittest_libcephfs_config EXCLUDE_FROM_ALL
   libcephfs_config.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_libcephfs_config unittest_libcephfs_config)
 add_dependencies(check unittest_libcephfs_config)
 target_link_libraries(unittest_libcephfs_config cephfs ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_libcephfs_config PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_lfnindex
 add_executable(unittest_lfnindex EXCLUDE_FROM_ALL
   os/TestLFNIndex.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_lfnindex unittest_lfnindex)
 add_dependencies(check unittest_lfnindex)
 target_link_libraries(unittest_lfnindex os global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_lfnindex PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -1166,7 +1069,6 @@ set_target_properties(unittest_lfnindex PROPERTIES COMPILE_FLAGS
 set(unittest_librados_config_srcs librados/librados_config.cc)
 add_executable(unittest_librados_config EXCLUDE_FROM_ALL
   ${unittest_librados_config_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_librados_config unittest_librados_config)
 add_dependencies(check unittest_librados_config)
@@ -1175,7 +1077,6 @@ target_link_libraries(unittest_librados_config
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
   )
 set_target_properties(unittest_librados_config PROPERTIES COMPILE_FLAGS
@@ -1184,7 +1085,6 @@ set_target_properties(unittest_librados_config PROPERTIES COMPILE_FLAGS
 # unittest_rbd_replay
 add_executable(unittest_rbd_replay EXCLUDE_FROM_ALL
   test_rbd_replay.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:parse_secret_objs>
 )
 add_test(unittest_rbd_replay unittest_rbd_replay)
@@ -1198,7 +1098,6 @@ target_link_libraries(unittest_rbd_replay
   keyutils
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS}
 )
 set_target_properties(unittest_rbd_replay PROPERTIES COMPILE_FLAGS
@@ -1208,12 +1107,11 @@ ${UNITTEST_CXX_FLAGS})
 add_executable(unittest_mon_moncap EXCLUDE_FROM_ALL
   ${unittest_mon_moncap_srcs}
   mon/moncap.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mon_moncap unittest_mon_moncap)
 add_dependencies(check unittest_mon_moncap)
 target_link_libraries(unittest_mon_moncap mon global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_mon_moncap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -1221,109 +1119,100 @@ set_target_properties(unittest_mon_moncap PROPERTIES COMPILE_FLAGS
 add_executable(unittest_mon_pgmap EXCLUDE_FROM_ALL
   mon/PGMap.cc
   ${unittest_mon_moncap_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mon_pgmap unittest_mon_pgmap)
 add_dependencies(check unittest_mon_pgmap)
 target_link_libraries(unittest_mon_pgmap mon global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_mon_pgmap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_ecbackend
 add_executable(unittest_ecbackend EXCLUDE_FROM_ALL
   osd/TestECBackend.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_ecbackend unittest_ecbackend)
 add_dependencies(check unittest_ecbackend)
 target_link_libraries(unittest_ecbackend osd global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_ecbackend PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_osdscrub
 add_executable(unittest_osdscrub EXCLUDE_FROM_ALL
   osd/TestOSDScrub.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_osdscrub unittest_osdscrub)
 add_dependencies(check unittest_osdscrub)
 target_link_libraries(unittest_osdscrub osd global dl os mon ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_osdscrub PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_pglog
 add_executable(unittest_pglog EXCLUDE_FROM_ALL
   osd/TestPGLog.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_pglog unittest_pglog)
 add_dependencies(check unittest_pglog)
 target_link_libraries(unittest_pglog osd global dl ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_pglog PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_hitset
 add_executable(unittest_hitset EXCLUDE_FROM_ALL
   osd/hitset.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_hitset unittest_hitset)
 add_dependencies(check unittest_hitset)
 target_link_libraries(unittest_hitset osd global ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_hitset PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_osd_osdcap
 add_executable(unittest_osd_osdcap EXCLUDE_FROM_ALL
   osd/osdcap.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
 )
 add_test(unittest_osd_osdcap unittest_osd_osdcap)
 add_dependencies(check unittest_osd_osdcap)
 target_link_libraries(unittest_osd_osdcap osd global ${CMAKE_DL_LIBS}
-${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_osd_osdcap PROPERTIES COMPILE_FLAGS
 ${UNITTEST_CXX_FLAGS})
 
 # unittest_snap_mapper
 add_executable(unittest_snap_mapper EXCLUDE_FROM_ALL
   test_snap_mapper.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_snap_mapper unittest_snap_mapper)
 add_dependencies(check unittest_snap_mapper)
 target_link_libraries(unittest_snap_mapper osd global ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_snap_mapper PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_mds_authcap
 add_executable(unittest_mds_authcap EXCLUDE_FROM_ALL
   mds/TestMDSAuthCaps.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_mds_authcap unittest_mds_authcap)
 add_dependencies(check unittest_mds_authcap)
 target_link_libraries(unittest_mds_authcap mds global ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_mds_authcap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_mds_sessionfilter
 add_executable(unittest_mds_sessionfilter EXCLUDE_FROM_ALL
     mds/TestSessionFilter.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:common_util_obj>
   )
 add_test(unittest_mds_sessionfilter unittest_mds_sessionfilter)
 add_dependencies(check unittest_mds_sessionfilter)
 target_link_libraries(unittest_mds_sessionfilter mds osdc common global
-  ${CMAKE_DL_LIBS} ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${CMAKE_DL_LIBS} ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_mds_sessionfilter PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -1333,7 +1222,7 @@ add_executable(unittest_ipaddr EXCLUDE_FROM_ALL
 add_test(unittest_ipaddr unittest_ipaddr)
 add_dependencies(check unittest_ipaddr)
 target_link_libraries(unittest_ipaddr mon global ${CMAKE_DL_LIBS} 
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_ipaddr PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -1341,26 +1230,23 @@ set_target_properties(unittest_ipaddr PROPERTIES COMPILE_FLAGS
 add_executable(unittest_texttable EXCLUDE_FROM_ALL
   test_texttable.cc
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_texttable unittest_texttable)
 add_dependencies(check unittest_texttable)
 target_link_libraries(unittest_texttable mon global ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${UNITTEST_LIBS})
 set_target_properties(unittest_texttable PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
 # unittest_on_exit
 add_executable(unittest_on_exit EXCLUDE_FROM_ALL
   on_exit.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_on_exit unittest_on_exit)
 add_dependencies(check unittest_on_exit)
 target_link_libraries(unittest_on_exit
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 add_test(unittest_on_exit unittest_on_exit)
 add_dependencies(check unittest_on_exit)
@@ -1370,14 +1256,12 @@ set_target_properties(unittest_on_exit PROPERTIES COMPILE_FLAGS
 # unittest_readahead
 add_executable(unittest_readahead EXCLUDE_FROM_ALL
   common/Readahead.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_readahead unittest_readahead)
 add_dependencies(check unittest_readahead)
 target_link_libraries(unittest_readahead
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 add_test(unittest_readahead unittest_readahead)
 add_dependencies(check unittest_readahead)
@@ -1387,14 +1271,12 @@ set_target_properties(unittest_readahead PROPERTIES COMPILE_FLAGS
 # unittest_tableformatter
 add_executable(unittest_tableformatter EXCLUDE_FROM_ALL
   common/test_tableformatter.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_tableformatter unittest_tableformatter)
 add_dependencies(check unittest_tableformatter)
 target_link_libraries(unittest_tableformatter
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 add_test(unittest_tableformatter unittest_tableformatter)
 add_dependencies(check unittest_tableformatter)
@@ -1404,14 +1286,12 @@ set_target_properties(unittest_tableformatter PROPERTIES COMPILE_FLAGS
 # unittest_bit_vector
 add_executable(unittest_bit_vector EXCLUDE_FROM_ALL
   common/test_bit_vector.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_bit_vector unittest_bit_vector)
 add_dependencies(check unittest_bit_vector)
 target_link_libraries(unittest_bit_vector
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 add_test(unittest_bit_vector unittest_bit_vector)
 add_dependencies(check unittest_bit_vector)
@@ -1421,14 +1301,12 @@ set_target_properties(unittest_bit_vector PROPERTIES COMPILE_FLAGS
 # unittest_interval_set
 add_executable(unittest_interval_set EXCLUDE_FROM_ALL
   common/test_interval_set.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_interval_set unittest_interval_set)
 add_dependencies(check unittest_interval_set)
 target_link_libraries(unittest_interval_set
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 add_test(unittest_interval_set unittest_interval_set)
 add_dependencies(check unittest_interval_set)
@@ -1438,13 +1316,11 @@ set_target_properties(unittest_interval_set PROPERTIES COMPILE_FLAGS
 # unittest_subprocess
 add_executable(unittest_subprocess EXCLUDE_FROM_ALL
   test_subprocess.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_dependencies(check unittest_subprocess)
 target_link_libraries(unittest_subprocess
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_subprocess PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1460,14 +1336,12 @@ set_target_properties(unittest_pageset PROPERTIES COMPILE_FLAGS
 # unittest_async_compressor
 add_executable(unittest_async_compressor EXCLUDE_FROM_ALL
   common/test_async_compressor.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
 )
 add_dependencies(check unittest_async_compressor)
 target_link_libraries(unittest_async_compressor
   global
   compressor
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_async_compressor PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1475,12 +1349,11 @@ set_target_properties(unittest_async_compressor PROPERTIES COMPILE_FLAGS
 # unittest_rocksdb_option
 add_executable(unittest_rocksdb_option EXCLUDE_FROM_ALL
   objectstore/TestRocksdbOptionParse.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 add_test(unittest_rocksdb_option unittest_rocksdb_option)
 add_dependencies(check unittest_rocksdb_option)
 target_link_libraries(unittest_rocksdb_option global os ${CMAKE_DL_LIBS}
-  ${BLKID_LIBRARIES} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+  ${BLKID_LIBRARIES} ${UNITTEST_LIBS})
 set_target_properties(unittest_rocksdb_option PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 
 # unittest_bluefs
@@ -1509,7 +1382,6 @@ if(${WITH_RADOSGW})
   set(test_cors_srcs test_cors.cc)
   add_executable(test_cors
     ${test_cors_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cors
     librados
@@ -1518,7 +1390,7 @@ if(${WITH_RADOSGW})
     curl
     expat
     ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+    ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
   set_target_properties(test_cors PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
 
@@ -1526,12 +1398,10 @@ if(${WITH_RADOSGW})
   set(test_rgw_manifest_srcs rgw/test_rgw_manifest.cc)
   add_executable(test_rgw_manifest
     ${test_rgw_manifest_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_rgw_manifest
     rgw_a
     ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS}
     ${UNITTEST_LIBS}
     ${CRYPTO_LIBS}
     )
@@ -1542,7 +1412,6 @@ if(${WITH_RADOSGW})
   set(test_rgw_obj_srcs rgw/test_rgw_obj.cc)
   add_executable(test_rgw_obj
     ${test_rgw_obj_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_rgw_obj
     rgw_a
@@ -1561,7 +1430,6 @@ if(${WITH_RADOSGW})
     uuid
     expat
     ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS}
     ${UNITTEST_LIBS}
     ${CRYPTO_LIBS}
     )
@@ -1572,14 +1440,13 @@ if(${WITH_RADOSGW})
   set(test_cls_rgw_meta_srcs test_rgw_admin_meta.cc)
   add_executable(test_cls_rgw_meta
     ${test_cls_rgw_meta_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cls_rgw_meta
     rgw_a
     boost_regex
     ${Boost_REGEX_LIBRARY}
     ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS} ${CRYPTO_LIBS})
+    ${CMAKE_DL_LIBS} ${UNITTEST_LIBS} ${CRYPTO_LIBS})
   set_target_properties(test_cls_rgw_meta PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
 
@@ -1589,7 +1456,6 @@ if(${WITH_RADOSGW})
     )
   add_executable(test_cls_rgw_log
     ${test_cls_rgw_log_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cls_rgw_log
     rgw_a
@@ -1607,7 +1473,6 @@ if(${WITH_RADOSGW})
     ${Boost_REGEX_LIBRARY}
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS}
     ${UNITTEST_LIBS}
     ${EXTRALIBS}
     ${CRYPTO_LIBS}
@@ -1619,13 +1484,11 @@ if(${WITH_RADOSGW})
   set(test_cls_rgw_opstate_srcs test_rgw_admin_opstate.cc)
   add_executable(test_cls_rgw_opstate
     ${test_cls_rgw_opstate_srcs}
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cls_rgw_opstate
     rgw_a
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
-    ${ALLOC_LIBS}
     ${UNITTEST_LIBS}
     ${CRYPTO_LIBS}
     ${EXTRALIBS}
@@ -1642,10 +1505,9 @@ set_target_properties(radostest PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 # multi_stress_watch
 add_executable(multi_stress_watch
   multi_stress_watch.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(multi_stress_watch librados global radostest
-  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
+  ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
 
 set(librados_test_stub_srcs
   librados_test_stub/LibradosTestStub.cc
@@ -1664,7 +1526,6 @@ add_executable(unittest_librbd EXCLUDE_FROM_ALL
   librbd/test_internal.cc
   librbd/test_support.cc
   librbd/test_main.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
   ${CMAKE_SOURCE_DIR}/src/common/secret.c
   )
@@ -1684,7 +1545,6 @@ target_link_libraries(unittest_librbd
   ${UNITTEST_LIBS}
   global
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   blkid
@@ -1695,7 +1555,6 @@ target_link_libraries(unittest_librbd
 
 add_executable(test_librbd_fsx
   librbd/fsx.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
   ${CMAKE_SOURCE_DIR}/src/common/secret.c
   )
@@ -1705,7 +1564,6 @@ target_link_libraries(test_librbd_fsx
   global
   m
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   blkid
@@ -1715,7 +1573,6 @@ target_link_libraries(test_librbd_fsx
 
 add_executable(test_cls_rbd
   cls_rbd/test_cls_rbd.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
   ${CMAKE_SOURCE_DIR}/src/common/secret.c
   )
@@ -1729,7 +1586,6 @@ target_link_libraries(test_cls_rbd
   global
   ${UNITTEST_LIBS}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1740,7 +1596,6 @@ target_link_libraries(test_cls_rbd
 
 add_executable(test_cls_refcount
   cls_refcount/test_cls_refcount.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_refcount PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1751,7 +1606,6 @@ target_link_libraries(test_cls_refcount
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1759,7 +1613,6 @@ target_link_libraries(test_cls_refcount
 
 add_executable(test_cls_version
   cls_version/test_cls_version.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_version PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1770,7 +1623,6 @@ target_link_libraries(test_cls_version
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1778,7 +1630,6 @@ target_link_libraries(test_cls_version
 
 add_executable(test_cls_log
   cls_log/test_cls_log.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_log PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1790,14 +1641,12 @@ target_link_libraries(test_cls_log
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   )
 
 add_executable(test_cls_statelog
   cls_statelog/test_cls_statelog.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_statelog PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1808,7 +1657,6 @@ target_link_libraries(test_cls_statelog
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1816,7 +1664,6 @@ target_link_libraries(test_cls_statelog
 
 add_executable(test_cls_replica_log
   cls_replica_log/test_cls_replica_log.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_replica_log PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1827,7 +1674,6 @@ target_link_libraries(test_cls_replica_log
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1835,7 +1681,6 @@ target_link_libraries(test_cls_replica_log
 
 add_executable(test_cls_lock
   cls_lock/test_cls_lock.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_lock PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1846,7 +1691,6 @@ target_link_libraries(test_cls_lock
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   radostest
@@ -1854,7 +1698,6 @@ target_link_libraries(test_cls_lock
 
 add_executable(test_cls_hello
   cls_hello/test_cls_hello.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_cls_hello PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -1863,7 +1706,6 @@ target_link_libraries(test_cls_hello
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   radostest
   ${UNITTEST_LIBS}
@@ -1878,7 +1720,6 @@ target_link_libraries(test_cls_numops
   cls_numops_client 
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   radostest
   ${UNITTEST_LIBS} 
@@ -1887,7 +1728,6 @@ target_link_libraries(test_cls_numops
 if(${WITH_RADOSGW})
   add_executable(test_cls_rgw
     cls_rgw/test_cls_rgw.cc
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   set_target_properties(test_cls_rgw PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
@@ -1898,7 +1738,6 @@ if(${WITH_RADOSGW})
     ${UNITTEST_LIBS}
     ${EXTRALIBS}
     ${BLKID_LIBRARIES}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     radostest)
 endif(${WITH_RADOSGW})
@@ -1906,20 +1745,18 @@ endif(${WITH_RADOSGW})
 # test_async_driver
 add_executable(test_async_driver
   msgr/test_async_driver.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_async_driver PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
-target_link_libraries(test_async_driver os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(test_async_driver os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 
 # test_msgr
 add_executable(test_msgr
   msgr/test_msgr.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_msgr PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
-target_link_libraries(test_msgr os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS} ${UNITTEST_LIBS})
+target_link_libraries(test_msgr os global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${UNITTEST_LIBS})
 
 #test_mon_msg
 add_executable(test_mon_msg mon/test-mon-msg.cc)
@@ -1957,152 +1794,135 @@ target_link_libraries(test_perf_msgr_client os global ${UNITTEST_LIBS})
 
 add_executable(test_mon_workloadgen
   mon/test_mon_workloadgen.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_mon_workloadgen
   os
   osdc
   global
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_rados_api_cmd
   librados/cmd.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_cmd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_cmd
-  librados global ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados global ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_io
   librados/io.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_io PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_io
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_c_write_operations
   librados/c_write_operations.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_c_write_operations PROPERTIES
   COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_c_write_operations
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_c_read_operations
   librados/c_read_operations.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_c_read_operations PROPERTIES COMPILE_FLAGS 
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_c_read_operations
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_aio
   librados/aio.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_aio PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_aio
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_list
   librados/list.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_list PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_list
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_nlist
   librados/nlist.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_nlist PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_nlist
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_pool
   librados/pool.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_pool PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS}
   )
 target_link_libraries(test_rados_api_pool
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_stat
   librados/stat.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_stat PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_stat
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_watch_notify
   librados/watch_notify.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_watch_notify PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_watch_notify
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_cls
   librados/cls.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_cls PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_cls
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_misc
   librados/misc.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_misc PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_misc
-  librados global ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados global ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_lock
   librados/lock.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_lock PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_lock
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_tier
   librados/tier.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_tier PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_tier
-  global librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  global librados ${UNITTEST_LIBS} radostest)
 
 add_executable(test_rados_api_snapshots
   librados/snapshots.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_rados_api_snapshots PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rados_api_snapshots
-  librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+  librados ${UNITTEST_LIBS} radostest)
 
 add_library(rados_striper_test STATIC libradosstriper/TestCase.cc)
 target_link_libraries(rados_striper_test radostest)
@@ -2111,10 +1931,9 @@ set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS
 
 add_executable(test_rados_api_striping
   libradosstriper/striping.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_rados_api_striping librados libradosstriper 
-  ${UNITTEST_LIBS} ${ALLOC_LIBS} rados_striper_test)
+  ${UNITTEST_LIBS} rados_striper_test)
 set_target_properties(test_rados_api_striping PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 
@@ -2127,7 +1946,6 @@ if(${WITH_CEPHFS})
     libcephfs/flock.cc
     libcephfs/acl.cc
     libcephfs/access.cc
-    $<TARGET_OBJECTS:heap_profiler_objs>
   )
   set_target_properties(test_libcephfs PROPERTIES COMPILE_FLAGS
     ${UNITTEST_CXX_FLAGS})
@@ -2136,14 +1954,12 @@ if(${WITH_CEPHFS})
     librados
     ${UNITTEST_LIBS}
     ${EXTRALIBS}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     )
 endif(${WITH_CEPHFS})  
 
 add_executable(test_objectstore
   objectstore/store_test.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_objectstore PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2154,13 +1970,11 @@ target_link_libraries(test_objectstore
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_keyvaluedb
   objectstore/test_kv.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_keyvaluedb PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2171,21 +1985,18 @@ target_link_libraries(test_keyvaluedb
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_objectstore_workloadgen
   objectstore/workload_generator.cc
   objectstore/TestObjectStoreState.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_objectstore_workloadgen
   os
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -2205,14 +2016,12 @@ add_executable(test_filestore_idempotent
   objectstore/test_idempotent.cc
   objectstore/FileStoreTracker.cc
   common/ObjectContents.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_filestore_idempotent
   os
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -2221,20 +2030,17 @@ add_executable(test_filestore_idempotent_sequence
   objectstore/DeterministicOpSequence.cc
   objectstore/TestObjectStoreState.cc
   objectstore/FileStoreDiff.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_filestore_idempotent_sequence
   os
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_xattr_bench
   xattr_bench.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_xattr_bench PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2245,13 +2051,11 @@ target_link_libraries(test_xattr_bench
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_filejournal
   test_filejournal.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_filejournal PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2262,14 +2066,12 @@ target_link_libraries(test_filejournal
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   ${EXTRALIBS}
   )
 
 add_executable(test_stress_watch
   test_stress_watch.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_stress_watch PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2280,27 +2082,23 @@ target_link_libraries(test_stress_watch
   radostest
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_objectcacher_stress
   osdc/object_cacher_stress.cc
   osdc/FakeWriteback.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_objectcacher_stress
   osdc
   global
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_object_map
   ObjectMap/test_object_map.cc
   ObjectMap/KeyValueDBMemory.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_object_map PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2310,13 +2108,11 @@ target_link_libraries(test_object_map
   ${UNITTEST_LIBS}
   global
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_keyvaluedb_atomicity
   ObjectMap/test_keyvaluedb_atomicity.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_keyvaluedb_atomicity PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2326,14 +2122,12 @@ target_link_libraries(test_keyvaluedb_atomicity
   ${UNITTEST_LIBS}
   global
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(test_keyvaluedb_iterators
   ObjectMap/test_keyvaluedb_iterators.cc
   ObjectMap/KeyValueDBMemory.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_keyvaluedb_iterators PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2343,14 +2137,12 @@ target_link_libraries(test_keyvaluedb_iterators
   ${UNITTEST_LIBS}
   global
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 # librgw_file (nfs-like RGW interface)
 add_executable(test_librgw_file
   librgw_file.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_librgw_file PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2359,14 +2151,12 @@ target_link_libraries(test_librgw_file
   librados
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 # librgw_file_cd (just the rgw_file create-delete bucket ops)
 add_executable(test_librgw_file_cd
   librgw_file_cd.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_librgw_file_cd PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2375,14 +2165,12 @@ target_link_libraries(test_librgw_file_cd
   librados
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 # librgw_file_gp (just the rgw_file get-put bucket ops)
 add_executable(test_librgw_file_gp
   librgw_file_gp.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_librgw_file_gp PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2391,14 +2179,12 @@ target_link_libraries(test_librgw_file_gp
   librados
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 # librgw_file_nfsns (nfs namespace tests)
 add_executable(test_librgw_file_nfsns
   librgw_file_nfsns.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_librgw_file_nfsns PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2407,14 +2193,12 @@ target_link_libraries(test_librgw_file_nfsns
   librados
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 # librgw_file_aw (nfs write transaction [atomic write] tests)
 add_executable(test_librgw_file_aw
   librgw_file_aw.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 set_target_properties(test_librgw_file_aw PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -2423,7 +2207,6 @@ target_link_libraries(test_librgw_file_aw
   librados
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -2435,7 +2218,6 @@ if(${HAVE_LIBFUSE})
     global
     os
     ${EXTRALIBS}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     )
 endif(${HAVE_LIBFUSE})
@@ -2443,52 +2225,44 @@ endif(${HAVE_LIBFUSE})
 if(${WITH_CEPHFS})
   add_executable(test_c_headers
     test_c_headers.c
-    $<TARGET_OBJECTS:heap_profiler_objs>
   )
   target_link_libraries(test_c_headers
     librados
     cephfs
     ${EXTRALIBS}
     ${BLKID_LIBRARIES}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     )
 endif(${WITH_CEPHFS})
 
 add_executable(test_get_blkdev_size
   test_get_blkdev_size.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(test_get_blkdev_size
   common
   pthread
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(simple_server
   messenger/simple_server.cc
   messenger/simple_dispatcher.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(simple_server
   os global common ${Boost_REGEX_LIBRARY}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
 add_executable(simple_client
   messenger/simple_client.cc
   messenger/simple_dispatcher.cc
-  $<TARGET_OBJECTS:heap_profiler_objs>
   )
 target_link_libraries(simple_client
   os global common ${Boost_REGEX_LIBRARY}
   ${EXTRALIBS}
-  ${ALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
 
@@ -2496,26 +2270,22 @@ if(HAVE_XIO)
   add_executable(xio_server
     messenger/xio_server.cc
     messenger/xio_dispatcher.cc
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(xio_server
     os global common ${Boost_REGEX_LIBRARY}
     ${Xio_LIBRARY} ibverbs rdmacm pthread rt
     ${EXTRALIBS}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     )
 
   add_executable(xio_client
     messenger/xio_client.cc
     messenger/xio_dispatcher.cc
-    $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(xio_client
     os global common ${Boost_REGEX_LIBRARY}
     ${Xio_LIBRARY} ibverbs rdmacm pthread rt
     ${EXTRALIBS}
-    ${ALLOC_LIBS}
     ${CMAKE_DL_LIBS}
     )
 endif(HAVE_XIO)

diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index 3abc01f92e45805140a9c1365573d5ffbae62d8a..9590079e4ee1b539bde99c25c7bb0cf13aaa8da8 100644 (file)
--- a/src/test/erasure-code/CMakeLists.txt
+++ b/src/test/erasure-code/CMakeLists.txt
@@ -58,7 +58,6 @@ target_link_libraries(unittest_erasure_code_plugin
   ec_example
   common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_plugin PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -75,7 +74,6 @@ target_link_libraries(unittest_erasure_code
   osd
   common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -116,7 +114,6 @@ target_link_libraries(unittest_erasure_code_plugin_jerasure
   ec_jerasure_generic
   common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_plugin_jerasure PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -138,7 +135,6 @@ target_link_libraries(unittest_erasure_code_isa
   erasure_code
   dl
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_isa PROPERTIES COMPILE_FLAGS
 ${UNITTEST_CXX_FLAGS})
@@ -159,7 +155,6 @@ target_link_libraries(unittest_erasure_code_plugin_isa
   dl
   erasure_code
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_plugin_isa PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -180,7 +175,6 @@ target_link_libraries(unittest_erasure_code_lrc
   ec_lrc
   common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_lrc PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -205,7 +199,6 @@ target_link_libraries(unittest_erasure_code_plugin_lrc
   ec_jerasure_generic
   common
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_plugin_lrc PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -248,7 +241,6 @@ target_link_libraries(unittest_erasure_code_plugin_shec
   common
   ec_shec_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_plugin_shec PROPERTIES COMPILE_FLAGS
   "${EC_LIBS_PATH_FLAG} ${UNITTEST_CXX_FLAGS}")
@@ -268,7 +260,6 @@ target_link_libraries(unittest_erasure_code_example
   common
   erasure_code
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_example PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -288,7 +279,6 @@ target_link_libraries(unittest_erasure_code_jerasure
   common
   ec_jerasure_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_jerasure PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -309,7 +299,6 @@ target_link_libraries(unittest_erasure_code_shec
   common
   ec_shec_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_shec PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -327,7 +316,6 @@ target_link_libraries(unittest_erasure_code_shec_all
   common
   ec_shec_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_shec_all PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -345,7 +333,6 @@ target_link_libraries(unittest_erasure_code_shec_thread
   common
   ec_shec_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_shec_thread PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -363,7 +350,6 @@ target_link_libraries(unittest_erasure_code_shec_arguments
   common
   ec_shec_generic
   ${CMAKE_DL_LIBS}
-  ${ALLOC_LIBS}
   ${UNITTEST_LIBS})
 set_target_properties(unittest_erasure_code_shec_arguments PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})