From 31e30ee326f07c62895f63ea292859b1d95d32e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Bl=C3=A5udd?= <magnus.blaudd@sun.com>
Date: Tue, 16 Nov 2010 10:05:54 +0100
Subject: Bug#58158 LINK_LIBRARIES for MYSQL_ADD_PLUGIN is not added to
 libmysqld   - Add ARG_LINK_LIBRARIES to MYSQLD_STATIC_PLUGIN_LIBS in    
 MYSQL_ADD_PLUGIN so that any libraries listed by the plugin is     added to
 libmysqld   - remove the variables NDB_CLIENT_LIBS and NDB_CLUSTER_INCLUDES  
   from libmysqld/CMakeLists.txt since those are just old remnants

---
 cmake/plugin.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmake')

diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 94fdc8bf1e9..6ff7e794440 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -123,7 +123,7 @@ MACRO(MYSQL_ADD_PLUGIN)
 
     # Update mysqld dependencies
     SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} 
-      ${target} CACHE INTERNAL "" FORCE)
+      ${target} ${ARG_LINK_LIBRARIES} CACHE INTERNAL "" FORCE)
 
     IF(ARG_MANDATORY)
       SET(${with_var} ON CACHE INTERNAL "Link ${plugin} statically to the server" 
-- 
cgit v1.2.1