diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-01 12:00:50 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-01 12:00:50 +0100 |
| commit | d2139f313583aa7f6e09a505ea44aff0073d0d0d (patch) | |
| tree | d89705a5ecb9443a34d6ac498e2557565ff952b2 /plugin | |
| parent | 43770e8f3f3fd22259b330756fad72737b079263 (diff) | |
| download | mariadb-git-d2139f313583aa7f6e09a505ea44aff0073d0d0d.tar.gz | |
- Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE
- Fix semisync library prefix (remove lib on Unixes)
- restrict exported symbols from zlib and yassl (fvisibility=hidden)
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugin/fulltext/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | plugin/semisync/CMakeLists.txt | 15 |
3 files changed, 7 insertions, 17 deletions
diff --git a/plugin/daemon_example/CMakeLists.txt b/plugin/daemon_example/CMakeLists.txt index 97ada05f935..e0f5f1caf78 100644 --- a/plugin/daemon_example/CMakeLists.txt +++ b/plugin/daemon_example/CMakeLists.txt @@ -13,6 +13,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(DAEMON_EXAMPLE_PLUGIN_DYNAMIC daemon_example) -SET(DAEMON_EXAMPLE_SOURCES daemon_example.cc) -MYSQL_PLUGIN(DAEMON_EXAMPLE) +MYSQL_ADD_PLUGIN(DAEMON_EXAMPLE daemon_example.cc MODULE_ONLY) diff --git a/plugin/fulltext/CMakeLists.txt b/plugin/fulltext/CMakeLists.txt index e0dd2ac510c..92cbd7acee5 100644 --- a/plugin/fulltext/CMakeLists.txt +++ b/plugin/fulltext/CMakeLists.txt @@ -13,6 +13,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(FTEXAMPLE_PLUGIN_DYNAMIC mypluglib) -SET(FTEXAMPLE_SOURCES plugin_example.c) -MYSQL_PLUGIN(FTEXAMPLE) + +MYSQL_ADD_PLUGIN(FTEXAMPLE plugin_example.c MODULE_ONLY MODULE_OUTPUT_NAME mypluglib) diff --git a/plugin/semisync/CMakeLists.txt b/plugin/semisync/CMakeLists.txt index 7681894207d..b852bce9463 100644 --- a/plugin/semisync/CMakeLists.txt +++ b/plugin/semisync/CMakeLists.txt @@ -13,20 +13,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02 -IF(WIN32) - SET(LIBPREFIX "") -ELSE() - SET(LIBPREFIX "lib") -ENDIF() + SET(SEMISYNC_MASTER_SOURCES semisync.cc semisync_master.cc semisync_master_plugin.cc semisync.h semisync_master.h) -SET(SEMISYNC_MASTER_PLUGIN_DYNAMIC ${LIBPREFIX}semisync_master) -MYSQL_PLUGIN(SEMISYNC_MASTER) +MYSQL_ADD_PLUGIN(semisync_master ${SEMISYNC_MASTER_SOURCES} MODULE_ONLY MODULE_OUTPUT_NAME "semisync_master") -SET(SEMISYNC_SLAVE_SOURCES semisync.cc semisync_slave.cc semisync_slave_plugin.cc -semisync.h semisync_slave.h ) -SET(SEMISYNC_SLAVE_PLUGIN_DYNAMIC ${LIBPREFIX}semisync_slave) -MYSQL_PLUGIN(SEMISYNC_SLAVE) +SET(SEMISYNC_SLAVE_SOURCES semisync.cc semisync_slave.cc semisync_slave_plugin.cc semisync.h semisync_slave.h ) +MYSQL_ADD_PLUGIN(semisync_slave ${SEMISYNC_MASTER_SOURCES} MODULE_ONLY MODULE_OUTPUT_NAME "semisync_slave") |