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 | fb140a87d3e32de982e1a1d5c6816dda34954cac (patch) | |
| tree | 64437a2a522feffb9b2aa990fe42401af54c686e /libmysqld | |
| parent | c7e273b5313fb71c20444e8ee70423b44fbd02c3 (diff) | |
| download | mariadb-git-fb140a87d3e32de982e1a1d5c6816dda34954cac.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 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
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 ) |