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
64d2849b
Commit
64d2849b
authored
Nov 26, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-24292 support semi-independent versioning for sub-packages
1. specify plugin version in MYSQL_ADD_PLUGIN
parent
8de233af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
cmake/plugin.cmake
cmake/plugin.cmake
+8
-3
No files found.
cmake/plugin.cmake
View file @
64d2849b
...
@@ -28,13 +28,14 @@ INCLUDE(CMakeParseArguments)
...
@@ -28,13 +28,14 @@ INCLUDE(CMakeParseArguments)
# [STATIC_OUTPUT_NAME static_name]
# [STATIC_OUTPUT_NAME static_name]
# [COMPONENT component]
# [COMPONENT component]
# [CONFIG cnf_file_name]
# [CONFIG cnf_file_name]
# [VERSION version_string]
# [LINK_LIBRARIES lib1...libN]
# [LINK_LIBRARIES lib1...libN]
# [DEPENDENCIES target1...targetN]
# [DEPENDENCIES target1...targetN]
MACRO
(
MYSQL_ADD_PLUGIN
)
MACRO
(
MYSQL_ADD_PLUGIN
)
CMAKE_PARSE_ARGUMENTS
(
ARG
CMAKE_PARSE_ARGUMENTS
(
ARG
"STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT"
"STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT"
"MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG"
"MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG
;VERSION
"
"LINK_LIBRARIES;DEPENDENCIES"
"LINK_LIBRARIES;DEPENDENCIES"
${
ARGN
}
${
ARGN
}
)
)
...
@@ -117,6 +118,10 @@ MACRO(MYSQL_ADD_PLUGIN)
...
@@ -117,6 +118,10 @@ MACRO(MYSQL_ADD_PLUGIN)
IF
(
NOT ARG_DEPENDENCIES
)
IF
(
NOT ARG_DEPENDENCIES
)
SET
(
ARG_DEPENDENCIES
)
SET
(
ARG_DEPENDENCIES
)
ENDIF
()
ENDIF
()
IF
(
ARG_VERSION
)
SET
(
version_string
";PLUGIN_
${
plugin
}
_VERSION=
\"
${
ARG_VERSION
}
\"
"
)
ENDIF
()
IF
(
NOT ARG_MODULE_OUTPUT_NAME
)
IF
(
NOT ARG_MODULE_OUTPUT_NAME
)
IF
(
ARG_STORAGE_ENGINE
)
IF
(
ARG_STORAGE_ENGINE
)
...
@@ -153,7 +158,7 @@ MACRO(MYSQL_ADD_PLUGIN)
...
@@ -153,7 +158,7 @@ MACRO(MYSQL_ADD_PLUGIN)
DTRACE_INSTRUMENT
(
${
target
}
_embedded
)
DTRACE_INSTRUMENT
(
${
target
}
_embedded
)
IF
(
ARG_RECOMPILE_FOR_EMBEDDED
)
IF
(
ARG_RECOMPILE_FOR_EMBEDDED
)
SET_TARGET_PROPERTIES
(
${
target
}
_embedded
SET_TARGET_PROPERTIES
(
${
target
}
_embedded
PROPERTIES COMPILE_DEFINITIONS
"EMBEDDED_LIBRARY"
)
PROPERTIES COMPILE_DEFINITIONS
"EMBEDDED_LIBRARY
${
version_string
}
"
)
ENDIF
()
ENDIF
()
ADD_DEPENDENCIES
(
${
target
}
_embedded GenError
)
ADD_DEPENDENCIES
(
${
target
}
_embedded GenError
)
ENDIF
()
ENDIF
()
...
@@ -204,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
...
@@ -204,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
SET_TARGET_PROPERTIES
(
${
target
}
PROPERTIES PREFIX
""
)
SET_TARGET_PROPERTIES
(
${
target
}
PROPERTIES PREFIX
""
)
IF
(
NOT ARG_CLIENT
)
IF
(
NOT ARG_CLIENT
)
SET_TARGET_PROPERTIES
(
${
target
}
PROPERTIES
SET_TARGET_PROPERTIES
(
${
target
}
PROPERTIES
COMPILE_DEFINITIONS
"MYSQL_DYNAMIC_PLUGIN"
)
COMPILE_DEFINITIONS
"MYSQL_DYNAMIC_PLUGIN
${
version_string
}
"
)
ENDIF
()
ENDIF
()
TARGET_LINK_LIBRARIES
(
${
target
}
mysqlservices
${
ARG_LINK_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
target
}
mysqlservices
${
ARG_LINK_LIBRARIES
}
)
...
...
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