From 6c4f31eccfd1233e4413132b11e6424e6f4e5990 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 --- 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 6db9754cb95..ead5c80ae90 100644 --- a/cmake/modules/Buildpmem.cmake +++ b/cmake/modules/Buildpmem.cmake @@ -44,10 +44,11 @@ function(build_pmem) add_library(pmem::pmem STATIC IMPORTED GLOBAL) 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 GLOBAL) -- 2.47.3