database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-24292 support semi-independent versioning for sub-packages

Browse Source 
1. specify plugin version in MYSQL_ADD_PLUGIN
This commit is contained in:
Sergei Golubchik
2020-11-26 17:56:02 +01:00
parent 8de233af81
commit 64d2849b3e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/plugin.cmake
View File

@@ -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}
) )
@@ -118,6 +119,10 @@ MACRO(MYSQL_ADD_PLUGIN)
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)
SET(ARG_MODULE_OUTPUT_NAME "ha_${target}") SET(ARG_MODULE_OUTPUT_NAME "ha_${target}")
@@ -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)
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})