Skip to content

M
MariaDB
Commit 29bb3744 authored by Eugene Kosov's avatar Eugene Kosov
Browse files
Options

fix libpmem InnoDB linking

parent e62e285f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
libmariadb @ 544b6f1d
Subproject commit 8e9c3116105d9a998a60991b7f4ba910d454d4b1 Subproject commit 544b6f1d12f0e5b2a141129075ff2d64feb0e4c9
storage/innobase/CMakeLists.txt
View file @ 29bb3744
...@@ -153,7 +153,8 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE ...@@ -153,7 +153,8 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
${CRC32_LIBRARY} ${CRC32_LIBRARY}
${NUMA_LIBRARY} ${NUMA_LIBRARY}
${LIBSYSTEMD} ${LIBSYSTEMD}
${LINKER_SCRIPT}) ${LINKER_SCRIPT}
${LIBPMEM})
IF(NOT TARGET innobase) IF(NOT TARGET innobase)
RETURN() RETURN()
...@@ -194,7 +195,3 @@ IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC)) ...@@ -194,7 +195,3 @@ IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC))
TARGET_LINK_LIBRARIES(innobase tpool) TARGET_LINK_LIBRARIES(innobase tpool)
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup)
ENDIF() ENDIF()
IF(LIBPMEM)
TARGET_LINK_LIBRARIES(innobase LINK_PRIVATE ${LIBPMEM})
ENDIF()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7