diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-05-19 14:26:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-05-19 22:58:34 +0200 |
| commit | ecd65884542dfd635a612f6bc7fd08e0ee0beb68 (patch) | |
| tree | 93ddcb1f4deb22f176a392a864258d79a4af7334 | |
| parent | b2340cdd0765cbe67dae6e8cbb7d86191467b435 (diff) | |
| download | mariadb-git-ecd65884542dfd635a612f6bc7fd08e0ee0beb68.tar.gz | |
show pmem detection in cmake
| -rw-r--r-- | cmake/FindPMEM.cmake | 9 | ||||
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cmake/FindPMEM.cmake b/cmake/FindPMEM.cmake index 7e3fafae560..73e71bc29f4 100644 --- a/cmake/FindPMEM.cmake +++ b/cmake/FindPMEM.cmake @@ -1,3 +1,12 @@ +if(PMEM_LIBRARIES) + set(PMEM_FOUND TRUE) + return() +endif() +if(DEFINED PMEM_LIBRARIES) + set(PMEM_FOUND FALSE) + return() +endif() + find_path(PMEM_INCLUDE_DIR NAMES libpmem.h) find_library(PMEM_LIBRARIES NAMES pmem) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index b27a2390a2e..35a1330cbd2 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -337,7 +337,7 @@ SET(INNOBASE_SOURCES ut/ut0wqueue.cc) OPTION(WITH_PMEM "Support redo log in persistent memory" OFF) -FIND_PACKAGE(PMEM QUIET) +FIND_PACKAGE(PMEM) IF(PMEM_FOUND) INCLUDE_DIRECTORIES(${PMEM_INCLUDES}) ADD_COMPILE_FLAGS(log/log0log.cc COMPILE_FLAGS "-DHAVE_PMEM") |