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
79ddd866
Commit
79ddd866
authored
Sep 11, 2017
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: don't overwrite tokudb.cnf during the build
parent
bba169b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
cmake/plugin.cmake
cmake/plugin.cmake
+5
-3
storage/tokudb/CMakeLists.txt
storage/tokudb/CMakeLists.txt
+1
-6
No files found.
cmake/plugin.cmake
View file @
79ddd866
...
...
@@ -235,9 +235,11 @@ MACRO(MYSQL_ADD_PLUGIN)
SET
(
CPACK_RPM_
${
ARG_COMPONENT
}
_PACKAGE_PROVIDES
"cmake_bug_13248"
PARENT_SCOPE
)
SET
(
CPACK_RPM_
${
ARG_COMPONENT
}
_PACKAGE_OBSOLETES
"cmake_bug_13248"
PARENT_SCOPE
)
SET
(
CPACK_RPM_
${
ARG_COMPONENT
}
_USER_FILELIST
${
ignored
}
PARENT_SCOPE
)
IF
(
NOT ARG_CLIENT AND NOT ARG_CONFIG AND UNIX
)
SET
(
ARG_CONFIG
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
target
}
.cnf"
)
FILE
(
WRITE
${
ARG_CONFIG
}
"[mariadb]
\n
plugin-load-add=
${
ARG_MODULE_OUTPUT_NAME
}
.so
\n
"
)
IF
(
NOT ARG_CLIENT AND UNIX
)
IF
(
NOT ARG_CONFIG
)
SET
(
ARG_CONFIG
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
target
}
.cnf"
)
FILE
(
WRITE
${
ARG_CONFIG
}
"[mariadb]
\n
plugin-load-add=
${
ARG_MODULE_OUTPUT_NAME
}
.so
\n
"
)
ENDIF
()
INSTALL
(
FILES
${
ARG_CONFIG
}
COMPONENT
${
ARG_COMPONENT
}
DESTINATION
${
INSTALL_SYSCONF2DIR
}
)
SET
(
CPACK_RPM_
${
ARG_COMPONENT
}
_USER_FILELIST
${
ignored
}
"%config(noreplace)
${
INSTALL_SYSCONF2DIR
}
/*"
PARENT_SCOPE
)
ENDIF
()
...
...
storage/tokudb/CMakeLists.txt
View file @
79ddd866
...
...
@@ -24,7 +24,7 @@ SET(TOKUDB_SOURCES
tokudb_thread.cc
tokudb_dir_cmd.cc
)
MYSQL_ADD_PLUGIN
(
tokudb
${
TOKUDB_SOURCES
}
STORAGE_ENGINE MODULE_ONLY
COMPONENT tokudb-engine
)
COMPONENT tokudb-engine
CONFIG tokudb.cnf
)
IF
(
NOT TARGET tokudb
)
RETURN
()
...
...
@@ -111,8 +111,3 @@ TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
SET
(
CMAKE_MODULE_LINKER_FLAGS_RELEASE
"
${
CMAKE_MODULE_LINKER_FLAGS_RELEASE
}
-flto -fuse-linker-plugin"
)
SET
(
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
"
${
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
}
-flto -fuse-linker-plugin"
)
IF
(
INSTALL_SYSCONF2DIR
)
INSTALL
(
FILES tokudb.cnf DESTINATION
${
INSTALL_SYSCONF2DIR
}
COMPONENT tokudb-engine
)
ENDIF
(
INSTALL_SYSCONF2DIR
)
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