show pmem detection in cmake

MariaDB · May 19, 2021 · ecd6588 · ecd6588
1 parent b2340cd
commit ecd6588
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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")