From a84a2e109112811cfbd3debe303fb6d6bdcd061f Mon Sep 17 00:00:00 2001 From: Yin Congmin Date: Sat, 25 Jun 2022 17:43:52 +0800 Subject: [PATCH] cmake: rename a series of pmem libraries to pmdk At first, libpmem was the only library. Later, pmem related libraries such as libpmemobj and libpmem2 were gradually added. These libraries were also integrated into one named pmdk. So rename to pmdk. Signed-off-by: Yin Congmin --- .../{Buildpmem.cmake => Buildpmdk.cmake} | 16 ++--- cmake/modules/Findpmdk.cmake | 60 +++++++++++++++++++ cmake/modules/Findpmem.cmake | 60 ------------------- src/CMakeLists.txt | 12 ++-- src/blk/CMakeLists.txt | 2 +- src/librbd/CMakeLists.txt | 6 +- 6 files changed, 78 insertions(+), 78 deletions(-) rename cmake/modules/{Buildpmem.cmake => Buildpmdk.cmake} (83%) create mode 100644 cmake/modules/Findpmdk.cmake delete mode 100644 cmake/modules/Findpmem.cmake diff --git a/cmake/modules/Buildpmem.cmake b/cmake/modules/Buildpmdk.cmake similarity index 83% rename from cmake/modules/Buildpmem.cmake rename to cmake/modules/Buildpmdk.cmake index e264fabd5d2..d07ac0e21d9 100644 --- a/cmake/modules/Buildpmem.cmake +++ b/cmake/modules/Buildpmdk.cmake @@ -1,4 +1,4 @@ -function(build_pmem) +function(build_pmdk) include(FindMake) find_make("MAKE_EXECUTABLE" "make_cmd") @@ -41,20 +41,20 @@ function(build_pmem) set(PMDK_LIB "${source_dir}/src/${PMDK_LIB_DIR}") # libpmem - add_library(pmem::pmem STATIC IMPORTED GLOBAL) - add_dependencies(pmem::pmem pmdk_ext) + add_library(pmdk::pmem STATIC IMPORTED GLOBAL) + add_dependencies(pmdk::pmem pmdk_ext) file(MAKE_DIRECTORY ${PMDK_INCLUDE}) find_package(Threads) - set_target_properties(pmem::pmem PROPERTIES + set_target_properties(pmdk::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 + add_library(pmdk::pmemobj STATIC IMPORTED GLOBAL) + add_dependencies(pmdk::pmemobj pmdk_ext) + set_target_properties(pmdk::pmemobj PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${PMDK_INCLUDE} IMPORTED_LOCATION "${PMDK_LIB}/libpmemobj.a" - INTERFACE_LINK_LIBRARIES "pmem::pmem;${CMAKE_THREAD_LIBS_INIT}") + INTERFACE_LINK_LIBRARIES "pmdk::pmem;${CMAKE_THREAD_LIBS_INIT}") endfunction() diff --git a/cmake/modules/Findpmdk.cmake b/cmake/modules/Findpmdk.cmake new file mode 100644 index 00000000000..0afce08b123 --- /dev/null +++ b/cmake/modules/Findpmdk.cmake @@ -0,0 +1,60 @@ +# - Find pmdk +# +# pmdk_INCLUDE_DIRS - Where to find pmdk headers +# pmdk_LIBRARIES - List of libraries when using pmdk. +# pmdk_FOUND - True if pmdk found. + +find_package(PkgConfig QUIET REQUIRED) + +# all pmdk libraries depend on pmem, so always find it +set(pmdk_FIND_COMPONENTS ${pmdk_FIND_COMPONENTS} pmem) +list(REMOVE_DUPLICATES pmdk_FIND_COMPONENTS) + +foreach(component ${pmdk_FIND_COMPONENTS}) + set(pmdk_COMPONENTS pmem pmemobj) + list(FIND pmdk_COMPONENTS "${component}" found) + if(found EQUAL -1) + message(FATAL_ERROR "unknown pmdk component: ${component}") + endif() + pkg_check_modules(PKG_${component} QUIET "lib${component}") + if(NOT pmdk_VERSION_STRING OR PKG_${component}_VERSION VERSION_LESS pmdk_VERSION_STRING) + set(pmdk_VERSION_STRING ${PKG_${component}_VERSION}) + endif() + find_path(pmdk_${component}_INCLUDE_DIR + NAMES lib${component}.h + HINTS ${PKG_${component}_INCLUDE_DIRS}) + find_library(pmdk_${component}_LIBRARY + NAMES ${component} + HINTS ${PKG_${component}_LIBRARY_DIRS}) + mark_as_advanced( + pmdk_${component}_INCLUDE_DIR + pmdk_${component}_LIBRARY) + list(APPEND pmdk_INCLUDE_DIRS "pmdk_${component}_INCLUDE_DIR") + list(APPEND pmdk_LIBRARIES "pmdk_${component}_LIBRARY") +endforeach() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(pmdk + REQUIRED_VARS pmdk_INCLUDE_DIRS pmdk_LIBRARIES + VERSION_VAR pmdk_VERSION_STRING) + +mark_as_advanced( + pmdk_INCLUDE_DIRS + pmdk_LIBRARIES) + +if(pmdk_FOUND) + foreach(component pmem ${pmdk_FIND_COMPONENTS}) + if(NOT TARGET pmdk::${component}) + add_library(pmdk::${component} UNKNOWN IMPORTED) + set_target_properties(pmdk::${component} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${pmdk_${component}_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${pmdk_${component}_LIBRARY}") + # all pmdk libraries call into pmdk::pmem + if(NOT component STREQUAL pmem) + set_target_properties(pmdk::${component} PROPERTIES + INTERFACE_LINK_LIBRARIES pmdk::pmem) + endif() + endif() + endforeach() +endif() diff --git a/cmake/modules/Findpmem.cmake b/cmake/modules/Findpmem.cmake deleted file mode 100644 index 6f0a03ad5dd..00000000000 --- a/cmake/modules/Findpmem.cmake +++ /dev/null @@ -1,60 +0,0 @@ -# - Find pmem -# -# pmem_INCLUDE_DIRS - Where to find libpmem headers -# pmem_LIBRARIES - List of libraries when using libpmem. -# pmem_FOUND - True if pmem found. - -find_package(PkgConfig QUIET REQUIRED) - -# all pmem libraries depend on pmem, so always find it -set(pmem_FIND_COMPONENTS ${pmem_FIND_COMPONENTS} pmem) -list(REMOVE_DUPLICATES pmem_FIND_COMPONENTS) - -foreach(component ${pmem_FIND_COMPONENTS}) - set(pmem_COMPONENTS pmem pmemobj) - list(FIND pmem_COMPONENTS "${component}" found) - if(found EQUAL -1) - message(FATAL_ERROR "unknown libpmem component: ${component}") - endif() - pkg_check_modules(PKG_${component} QUIET "lib${component}") - if(NOT pmem_VERSION_STRING OR PKG_${component}_VERSION VERSION_LESS pmem_VERSION_STRING) - set(pmem_VERSION_STRING ${PKG_${component}_VERSION}) - endif() - find_path(pmem_${component}_INCLUDE_DIR - NAMES lib${component}.h - HINTS ${PKG_${component}_INCLUDE_DIRS}) - find_library(pmem_${component}_LIBRARY - NAMES ${component} - HINTS ${PKG_${component}_LIBRARY_DIRS}) - mark_as_advanced( - pmem_${component}_INCLUDE_DIR - pmem_${component}_LIBRARY) - list(APPEND pmem_INCLUDE_DIRS "pmem_${component}_INCLUDE_DIR") - list(APPEND pmem_LIBRARIES "pmem_${component}_LIBRARY") -endforeach() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(pmem - REQUIRED_VARS pmem_INCLUDE_DIRS pmem_LIBRARIES - VERSION_VAR pmem_VERSION_STRING) - -mark_as_advanced( - pmem_INCLUDE_DIRS - pmem_LIBRARIES) - -if(pmem_FOUND) - foreach(component pmem ${pmem_FIND_COMPONENTS}) - if(NOT TARGET pmem::${component}) - add_library(pmem::${component} UNKNOWN IMPORTED) - set_target_properties(pmem::${component} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${pmem_${component}_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${pmem_${component}_LIBRARY}") - # all pmem libraries calls into pmem::pmem - if(NOT component STREQUAL pmem) - set_target_properties(pmem::${component} PROPERTIES - INTERFACE_LINK_LIBRARIES pmem::pmem) - endif() - endif() - endforeach() -endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2dbe5a6eccc..7fa82a15ebb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -484,17 +484,17 @@ endif() if(WITH_BLUESTORE_PMEM OR WITH_RBD_RWL) if(WITH_SYSTEM_PMDK) - set(pmem_COMPONENTS) + set(pmdk_COMPONENTS) if(WITH_BLUESTORE_PMEM) - list(APPEND pmem_COMPONENTS pmem) + list(APPEND pmdk_COMPONENTS pmem) endif() if(WITH_RBD_RWL) - list(APPEND pmem_COMPONENTS pmemobj) + list(APPEND pmdk_COMPONENTS pmemobj) endif() - find_package(pmem 1.8 REQUIRED COMPONENTS ${pmem_COMPONENTS}) + find_package(pmdk 1.8 REQUIRED COMPONENTS ${pmdk_COMPONENTS}) else() - include(Buildpmem) - build_pmem() + include(Buildpmdk) + build_pmdk() endif() endif() diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt index 40afb84dc14..629dfe2c319 100644 --- a/src/blk/CMakeLists.txt +++ b/src/blk/CMakeLists.txt @@ -49,7 +49,7 @@ if(WITH_BLUESTORE_PMEM) endif() target_link_libraries(blk - PRIVATE pmem::pmem) + PRIVATE pmdk::pmem) endif() if(WITH_EVENTTRACE) diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt index ad23f0975fd..0c33fc3e224 100644 --- a/src/librbd/CMakeLists.txt +++ b/src/librbd/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(rbd_types STATIC if (WITH_RBD_RWL) target_link_libraries(rbd_types - PUBLIC pmem::pmemobj) + PUBLIC pmdk::pmemobj) endif() set(librbd_internal_srcs @@ -306,8 +306,8 @@ if(WITH_RBD_RWL OR WITH_RBD_SSD_CACHE) if(WITH_RBD_RWL) target_link_libraries(librbd_plugin_pwl_cache - PUBLIC pmem::pmemobj - PRIVATE pmem::pmem) + PUBLIC pmdk::pmemobj + PRIVATE pmdk::pmem) endif() set_target_properties(librbd_plugin_pwl_cache PROPERTIES -- 2.39.5