import ceph quincy 17.2.4

[ceph.git] / ceph / cmake / modules / Buildpmem.cmake

diff --git a/ceph/cmake/modules/Buildpmem.cmake b/ceph/cmake/modules/Buildpmem.cmake
index 30699283c097106c393c677f7b1fa826bd8f485c..61c5ba6019f032ffb5ae9e847cc89b6484eb2ecf 100644 (file)
--- a/ceph/cmake/modules/Buildpmem.cmake
+++ b/ceph/cmake/modules/Buildpmem.cmake
@@ -1,7 +1,18 @@
 function(build_pmem)
-  include(ExternalProject)
-  set(PMDK_SRC "${CMAKE_BINARY_DIR}/src/pmdk/src")
-  set(PMDK_INCLUDE "${PMDK_SRC}/include")
+  include(FindMake)
+  find_make("MAKE_EXECUTABLE" "make_cmd")
+
+  if(EXISTS "${PROJECT_SOURCE_DIR}/src/pmdk/Makefile")
+    set(source_dir_args
+      SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/pmdk")
+  else()
+    set(source_dir_args
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/src/pmdk
+      GIT_REPOSITORY https://github.com/ceph/pmdk.git
+      GIT_TAG "1.10"
+      GIT_SHALLOW TRUE
+      GIT_CONFIG advice.detachedHead=false)
+  endif()
 
   # Use debug PMDK libs in debug lib/rbd builds
   if(CMAKE_BUILD_TYPE STREQUAL Debug)
@@ -9,37 +20,42 @@ function(build_pmem)
   else()
     set(PMDK_LIB_DIR "nondebug")
   endif()
-  set(PMDK_LIB "${PMDK_SRC}/${PMDK_LIB_DIR}")
 
+  set(pmdk_cflags "-Wno-error -fno-lto")
+  include(ExternalProject)
   ExternalProject_Add(pmdk_ext
-      GIT_REPOSITORY "https://github.com/ceph/pmdk.git"
-      GIT_TAG "1.7"
-      SOURCE_DIR ${CMAKE_BINARY_DIR}/src/pmdk
+      ${source_dir_args}
       CONFIGURE_COMMAND ""
       # Explicitly built w/o NDCTL, otherwise if ndtcl is present on the
       # build system tests statically linking to librbd (which uses
       # libpmemobj) will not link (because we don't build the ndctl
       # static library here).
-      BUILD_COMMAND $(MAKE) NDCTL_ENABLE=n
+      BUILD_COMMAND ${make_cmd} CC=${CMAKE_C_COMPILER} "EXTRA_CFLAGS=${pmdk_cflags}" NDCTL_ENABLE=n BUILD_EXAMPLES=n BUILD_BENCHMARKS=n DOC=n
       BUILD_IN_SOURCE 1
-      BUILD_BYPRODUCTS "${PMDK_LIB}/libpmem.a" "${PMDK_LIB}/libpmemobj.a"
-      INSTALL_COMMAND "true")
+      BUILD_BYPRODUCTS "<SOURCE_DIR>/src/${PMDK_LIB_DIR}/libpmem.a" "<SOURCE_DIR>/src/${PMDK_LIB_DIR}/libpmemobj.a"
+      INSTALL_COMMAND "")
+  unset(make_cmd)
 
-    # libpmem
-    add_library(pmem::pmem STATIC IMPORTED)
-    add_dependencies(pmem::pmem pmdk_ext)
-    file(MAKE_DIRECTORY ${PMDK_INCLUDE})
-    set_target_properties(pmem::pmem PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
-      IMPORTED_LOCATION "${PMDK_LIB}/libpmem.a"
-      INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  ExternalProject_Get_Property(pmdk_ext source_dir)
+  set(PMDK_SRC "${source_dir}/src")
+  set(PMDK_INCLUDE "${source_dir}/src/include")
+  set(PMDK_LIB "${source_dir}/src/${PMDK_LIB_DIR}")
 
-    # libpmemobj
-    add_library(pmem::pmemobj STATIC IMPORTED)
-    add_dependencies(pmem::pmemobj pmdk_ext)
-    set_target_properties(pmem::pmemobj PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
-      IMPORTED_LOCATION "${PMDK_LIB}/libpmemobj.a"
-      INTERFACE_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  # libpmem
+  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 Threads::Threads)
 
+  # libpmemobj
+  add_library(pmem::pmemobj STATIC IMPORTED GLOBAL)
+  add_dependencies(pmem::pmemobj pmdk_ext)
+  set_target_properties(pmem::pmemobj PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}
+    IMPORTED_LOCATION "${PMDK_LIB}/libpmemobj.a"
+    INTERFACE_LINK_LIBRARIES "pmem::pmem;${CMAKE_THREAD_LIBS_INIT}")
 endfunction()