From 07a07774e9ce9d89616a71f6a359049d4201c386 Mon Sep 17 00:00:00 2001 From: Darien Imai Date: Thu, 26 Aug 2021 20:08:03 -0700 Subject: [PATCH] Fix building on Ubuntu --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39a313c..d26f363 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,9 +69,14 @@ endif() ##################### PMDK #################### if(${PMEM_BACKEND} STREQUAL "PMDK") - set(PMDK_LIB_PATH "/usr/local/lib" CACHE STRING "PMDK lib install path") + find_path(pmem_pmemobj_INCLUDE_DIR libpmemobj.h) + find_library(pmem_pmemobj_LIBRARY pmemobj) add_library(pmemobj SHARED IMPORTED) - set_property(TARGET pmemobj PROPERTY IMPORTED_LOCATION ${PMDK_LIB_PATH}/libpmemobj.so) + set_target_properties(pmemobj PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${pmem_pmemobj_INCLUDE_DIR} + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION ${pmem_pmemobj_LIBRARY} + ) endif() ############################################## @@ -83,7 +88,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.8.1 + GIT_TAG release-1.11.0 ) FetchContent_GetProperties(googletest) if (NOT googletest_POPULATED)