diff options
| author | Vladislav Vaintroub <vv221804@astra04> | 2010-01-27 01:54:41 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vv221804@astra04> | 2010-01-27 01:54:41 +0100 |
| commit | 90d4e963f154bbbee3fc81287941e94bf66cb5aa (patch) | |
| tree | 23edfb871757119e58be03bf4ee5d4f4ffb8cda7 /cmake | |
| parent | 0a6fe4fb84f26436113fcfc81eee2bea4a702135 (diff) | |
| parent | 6625d6b905e75ab5d740f0c738dbc1da7212665d (diff) | |
| download | mariadb-git-90d4e963f154bbbee3fc81287941e94bf66cb5aa.tar.gz | |
merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index f4aaeb651d7..2c00c71c3ee 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -113,9 +113,12 @@ MACRO(MYSQL_ADD_PLUGIN) SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} ${target} CACHE INTERNAL "" FORCE) - IF(NOT ARG_MANDATORY) + IF(ARG_MANDATORY) + SET(${with_var} ON CACHE INTERNAL "Link ${plugin} statically to the server" + FORCE) + ELSE() SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server" - FORCE) + FORCE) ENDIF() IF(ARG_MANDATORY) |