cmake: use src/pmdk for building pmdk if it exists

so we can build with pmdk enabled if the dist tarball
contains pmdk

Signed-off-by: Feng Hualong <hualong.feng@intel.com>
(cherry picked from commit 14c2a2e59fbdc716d35c08735d50bdadfab8300d)

 Conflicts:
	cmake/modules/Buildpmem.cmake
trivial fix, adopt what master has:
1. external_project args >> source_dir_args
2. INSTALL_COMMAND ""

diff --git a/cmake/modules/Buildpmem.cmake b/cmake/modules/Buildpmem.cmake
index 73ddc4eb3385935b7ce7f597fde1b3ac343e5425..b147db43c9452521ee2112c61b2f92d603136282 100644 (file)
--- a/cmake/modules/Buildpmem.cmake
+++ b/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.7"
+      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,28 +20,28 @@ function(build_pmem)
   else()
     set(PMDK_LIB_DIR "nondebug")
   endif()
-  set(PMDK_LIB "${PMDK_SRC}/${PMDK_LIB_DIR}")
-
-  include(FindMake)
-  find_make("MAKE_EXECUTABLE" "make_cmd")
 
+  include(ExternalProject)
   ExternalProject_Add(pmdk_ext
-      GIT_REPOSITORY "https://github.com/ceph/pmdk.git"
-      GIT_TAG "1.7"
-      GIT_SHALLOW TRUE
-      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_cmd} CC=${CMAKE_C_COMPILER} NDCTL_ENABLE=n
+      BUILD_COMMAND ${make_cmd} CC=${CMAKE_C_COMPILER} 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)
+
+  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}")
 
   # libpmem
-  add_library(pmem::pmem STATIC IMPORTED)
+  add_library(pmem::pmem STATIC IMPORTED GLOBAL)
   add_dependencies(pmem::pmem pmdk_ext)
   file(MAKE_DIRECTORY ${PMDK_INCLUDE})
   find_package(Threads)
@@ -40,7 +51,7 @@ function(build_pmem)
     INTERFACE_LINK_LIBRARIES Threads::Threads)
 
   # libpmemobj
-  add_library(pmem::pmemobj STATIC IMPORTED)
+  add_library(pmem::pmemobj STATIC IMPORTED GLOBAL)
   add_dependencies(pmem::pmemobj pmdk_ext)
   set_target_properties(pmem::pmemobj PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE}