From 269ab56f8b4056ec63e712ba305761dd835ea10e Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 6 Mar 2017 22:42:00 +0100
Subject: 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
---
 cmake/plugin.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cmake/plugin.cmake')

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})
 
-- 
cgit v1.2.1