From 31e30ee326f07c62895f63ea292859b1d95d32e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Bl=C3=A5udd?= Date: Tue, 16 Nov 2010 10:05:54 +0100 Subject: [PATCH] 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 +- libmysqld/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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" diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 545d03532c1..25f4b752a30 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -26,7 +26,6 @@ ${CMAKE_SOURCE_DIR}/regex ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} ${SSL_INTERNAL_INCLUDE_DIRS} -${NDB_CLUSTER_INCLUDES} ${CMAKE_SOURCE_DIR}/sql/backup ) @@ -110,7 +109,7 @@ SET(LIBS dbug strings regex mysys vio ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBWRAP} ${LIBCRYPT} ${LIBDL} - ${MYSQLD_STATIC_PLUGIN_LIBS} ${NDB_CLIENT_LIBS} + ${MYSQLD_STATIC_PLUGIN_LIBS} sql_embedded )