diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-16 10:05:54 +0100 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-16 10:05:54 +0100 |
| commit | 31e30ee326f07c62895f63ea292859b1d95d32e2 (patch) | |
| tree | 64437a2a522feffb9b2aa990fe42401af54c686e /cmake/plugin.cmake | |
| parent | dec388d5beac2e9d0d32ce1610b871c3d1042544 (diff) | |
| download | mariadb-git-31e30ee326f07c62895f63ea292859b1d95d32e2.tar.gz | |
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
Diffstat (limited to 'cmake/plugin.cmake')
| -rw-r--r-- | cmake/plugin.cmake | 2 |
1 files changed, 1 insertions, 1 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" |