Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
29bb3744
Commit
29bb3744
authored
Feb 19, 2020
by
Eugene Kosov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix libpmem InnoDB linking
parent
e62e285f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
libmariadb
libmariadb
+1
-1
storage/innobase/CMakeLists.txt
storage/innobase/CMakeLists.txt
+2
-5
No files found.
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
${
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
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment