Skip to content

Commit ecd6588

Browse files
committed
show pmem detection in cmake
1 parent b2340cd commit ecd6588

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

cmake/FindPMEM.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
if(PMEM_LIBRARIES)
2+
set(PMEM_FOUND TRUE)
3+
return()
4+
endif()
5+
if(DEFINED PMEM_LIBRARIES)
6+
set(PMEM_FOUND FALSE)
7+
return()
8+
endif()
9+
110
find_path(PMEM_INCLUDE_DIR NAMES libpmem.h)
211
find_library(PMEM_LIBRARIES NAMES pmem)
312

storage/innobase/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ SET(INNOBASE_SOURCES
337337
ut/ut0wqueue.cc)
338338

339339
OPTION(WITH_PMEM "Support redo log in persistent memory" OFF)
340-
FIND_PACKAGE(PMEM QUIET)
340+
FIND_PACKAGE(PMEM)
341341
IF(PMEM_FOUND)
342342
INCLUDE_DIRECTORIES(${PMEM_INCLUDES})
343343
ADD_COMPILE_FLAGS(log/log0log.cc COMPILE_FLAGS "-DHAVE_PMEM")

0 commit comments

Comments
 (0)