RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: link Threads::Threads instead of CMAKE_THREAD_LIBS_INIT

Browse Source 
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 <kdreyer@redhat.com>
Co-authored-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Ken Dreyer 2021-08-20 10:44:39 -04:00
parent 8a3448f6a9
commit 6c4f31eccf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/modules/Buildpmem.cmake
View File

@ -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)