diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-06 22:42:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-10 18:21:28 +0100 |
| commit | 269ab56f8b4056ec63e712ba305761dd835ea10e (patch) | |
| tree | 9e2659b5b3bba59f23836d1dee8fd348bfd0f3c7 /cmake/plugin.cmake | |
| parent | 227f63db3b0b9a1ce29c37f1c104ba5d204d0392 (diff) | |
| download | mariadb-git-269ab56f8b4056ec63e712ba305761dd835ea10e.tar.gz | |
small plugin API related fixes
* define MYSQL_DYNAMIC_PLUGIN only for server plugins
* don't typedef my_bool in mysql.h if plugin.h has already done it
* fix the include guard in plugin.h
Diffstat (limited to 'cmake/plugin.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 818264f9edf..3fbb19381bc 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -186,8 +186,11 @@ MACRO(MYSQL_ADD_PLUGIN) ADD_LIBRARY(${target} MODULE ${SOURCES}) DTRACE_INSTRUMENT(${target}) - SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "" - COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") + SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "") + IF (NOT ARG_CLIENT) + SET_TARGET_PROPERTIES (${target} PROPERTIES + COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") + ENDIF() TARGET_LINK_LIBRARIES (${target} mysqlservices ${ARG_LINK_LIBRARIES}) |