From e5648597c0ec67900d10e7f6ce11ea3bd3e746ed Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Fri, 20 Aug 2021 10:44:39 -0400 Subject: [PATCH] cmake: link Threads::Threads instead of CMAKE_THREAD_LIBS_INIT CMAKE_THREAD_LIBS_INIT can be empty. On newer platforms, this leads to an error: CMake Error at cmake/modules/Buildpmem.cmake:47 (set_target_properties): set_target_properties called with incorrect number of arguments. This is because glibc 2.34 merged libpthread.so into libc.so. Fedora 35 and RHEL 9 have glibc 2.34. Fixes: https://tracker.ceph.com/issues/52353 Signed-off-by: Ken Dreyer Co-authored-by: Kefu Chai (cherry picked from commit 6c4f31eccfd1233e4413132b11e6424e6f4e5990) --- cmake/modules/Buildpmem.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/Buildpmem.cmake b/cmake/modules/Buildpmem.cmake index 2439ac0fd2d3f..73ddc4eb33859 100644 --- a/cmake/modules/Buildpmem.cmake +++ b/cmake/modules/Buildpmem.cmake @@ -33,10 +33,11 @@ function(build_pmem) add_library(pmem::pmem STATIC IMPORTED) add_dependencies(pmem::pmem pmdk_ext) file(MAKE_DIRECTORY ${PMDK_INCLUDE}) + find_package(Threads) set_target_properties(pmem::pmem PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE} IMPORTED_LOCATION "${PMDK_LIB}/libpmem.a" - INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + INTERFACE_LINK_LIBRARIES Threads::Threads) # libpmemobj add_library(pmem::pmemobj STATIC IMPORTED) -- 2.47.3