diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /cmake | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 138901dfa8a..31e1fceec23 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -135,11 +135,11 @@ MACRO(MYSQL_ADD_PLUGIN) IF(ARG_MANDATORY) SET (mysql_mandatory_plugins - "${mysql_mandatory_plugins} builtin_${target}_plugin," + "${mysql_mandatory_plugins} builtin_maria_${target}_plugin," PARENT_SCOPE) ELSE() SET (mysql_optional_plugins - "${mysql_optional_plugins} builtin_${target}_plugin," + "${mysql_optional_plugins} builtin_maria_${target}_plugin," PARENT_SCOPE) ENDIF() ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY AND NOT WITHOUT_DYNAMIC_PLUGINS) |