diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2020-02-19 16:37:06 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2020-02-19 16:37:06 +0300 |
| commit | 29bb3744b4c35c3ecaf3bb83aa2c617e44f9078f (patch) | |
| tree | 5243aecf28646933b2890cd888d74ff0be8ecde4 /storage | |
| parent | e62e285fc4642ff2871bbc819abd17d0aa51a800 (diff) | |
| download | mariadb-git-29bb3744b4c35c3ecaf3bb83aa2c617e44f9078f.tar.gz | |
fix libpmem InnoDB linking
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 23780f1ff8a..e4286aac6a0 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -153,7 +153,8 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE ${CRC32_LIBRARY} ${NUMA_LIBRARY} ${LIBSYSTEMD} - ${LINKER_SCRIPT}) + ${LINKER_SCRIPT} + ${LIBPMEM}) IF(NOT TARGET innobase) RETURN() @@ -194,7 +195,3 @@ IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC)) TARGET_LINK_LIBRARIES(innobase tpool) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup) ENDIF() - -IF(LIBPMEM) - TARGET_LINK_LIBRARIES(innobase LINK_PRIVATE ${LIBPMEM}) -ENDIF() |