diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:28:21 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:28:21 +0200 |
commit | 0d25ee4f13b2eb79e9af3b3778c23f63d9a57c12 (patch) | |
tree | dfd00476074ff91a09241cb42658164dd8050520 /cmake | |
parent | c50ee6c23dbeb090963580754bec2f0a96ac0557 (diff) | |
download | mariadb-git-0d25ee4f13b2eb79e9af3b3778c23f63d9a57c12.tar.gz |
MDEV-4254 Semisync plugins to link statically into MariaDB
fix semisync plugins and tests to work with both with static and dynamic linking
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/plugin.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 2978fb1a13c..f016d8eab4f 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -171,12 +171,12 @@ MACRO(MYSQL_ADD_PLUGIN) IF(ARG_MANDATORY) SET (mysql_mandatory_plugins - "${mysql_mandatory_plugins} builtin_maria_${target}_plugin," - PARENT_SCOPE) + "${mysql_mandatory_plugins} builtin_maria_${target}_plugin,") + SET (mysql_mandatory_plugins ${mysql_mandatory_plugins} PARENT_SCOPE) ELSE() SET (mysql_optional_plugins - "${mysql_optional_plugins} builtin_maria_${target}_plugin," - PARENT_SCOPE) + "${mysql_optional_plugins} builtin_maria_${target}_plugin,") + SET (mysql_optional_plugins ${mysql_optional_plugins} PARENT_SCOPE) ENDIF() ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY AND NOT WITHOUT_DYNAMIC_PLUGINS) |