diff options
| author | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
| commit | 541edcc2e4a746908e508c6f997baf13c02aee89 (patch) | |
| tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /cmake | |
| parent | 0940d7d2040f71686901bcc0cd708f562a9ee271 (diff) | |
| parent | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (diff) | |
| download | mariadb-git-541edcc2e4a746908e508c6f997baf13c02aee89.tar.gz | |
merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 3e46f523973..b9169ebb73e 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -113,12 +113,21 @@ MACRO(MYSQL_ADD_PLUGIN) SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} ${target} CACHE INTERNAL "") - SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${target}_plugin" - PARENT_SCOPE) + IF(ARG_STORAGE_ENGINE) SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server" FORCE) ENDIF() + + IF(ARG_MANDATORY) + SET (mysql_mandatory_plugins + "${mysql_mandatory_plugins} builtin_${target}_plugin," + PARENT_SCOPE) + ELSE() + SET (mysql_optional_plugins + "${mysql_optional_plugins} builtin_${target}_plugin," + PARENT_SCOPE) + ENDIF() ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY AND NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT ARG_MODULE_OUTPUT_NAME) IF(ARG_STORAGE_ENGINE) |