From: Patrick Donnelly Date: Wed, 4 Jun 2025 12:42:39 +0000 (-0400) Subject: Merge PR #62865 into main X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aeed3999d265571906eb0ec82ed0d61ecdd0a0ac;p=ceph.git Merge PR #62865 into main * refs/pull/62865/head: test/libcephfs: copy DT_NEEDED entries from input libraries test/fs: only add libcephfs as library dependency test/client: do not depend on libcephfs Reviewed-by: Viacheslav Dubeyko --- aeed3999d265571906eb0ec82ed0d61ecdd0a0ac diff --cc src/test/libcephfs/CMakeLists.txt index 6a75dd2578b1,2573fa08f66c..272c2669819c --- a/src/test/libcephfs/CMakeLists.txt +++ b/src/test/libcephfs/CMakeLists.txt @@@ -119,22 -156,10 +156,25 @@@ if(WITH_LIBCEPHFS ${UNITTEST_LIBS} ${EXTRALIBS} ${CMAKE_DL_LIBS} - ) + ) + if(NOT WIN32) + target_link_options(ceph_test_libcephfs_access PRIVATE -Wl,--copy-dt-needed-entries) + endif() install(TARGETS ceph_test_libcephfs_access DESTINATION ${CMAKE_INSTALL_BINDIR}) + + add_executable(ceph_test_libcephfs_perfcounters + perfcounters.cc + main.cc + ) + target_link_libraries(ceph_test_libcephfs_perfcounters + ceph-common + cephfs + librados + ${UNITTEST_LIBS} + ${EXTRALIBS} + ${CMAKE_DL_LIBS} + ) + install(TARGETS ceph_test_libcephfs_perfcounters + DESTINATION ${CMAKE_INSTALL_BINDIR}) endif(WITH_LIBCEPHFS)