]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: link Threads::Threads instead of CMAKE_THREAD_LIBS_INIT 42870/head
authorKen Dreyer <kdreyer@redhat.com>
Fri, 20 Aug 2021 14:44:39 +0000 (10:44 -0400)
committerKen Dreyer <kdreyer@redhat.com>
Tue, 24 Aug 2021 17:12:10 +0000 (13:12 -0400)
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>
cmake/modules/Buildpmem.cmake

index 6db9754cb95f7c488d7c676899832517388a5b29..ead5c80ae90f56062ec5743ad64d88c3b80085a1 100644 (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)