From e730ea1e3ebe2a5f3b6d93d5c05c3c387fab8c57 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 3 Jun 2019 09:55:40 +0200 Subject: Only link mysys_ssl when required. Do not use TARGET_LINK_LIBRARIES(mysys mysys_ssl), this means that mysys_ssl is linked to practically everything. --- plugin/auth_ed25519/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index 73d8eeb208b..8ed50e8fec9 100644 --- a/plugin/auth_ed25519/CMakeLists.txt +++ b/plugin/auth_ed25519/CMakeLists.txt @@ -28,5 +28,5 @@ MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) IF(WITH_UNIT_TESTS) - MY_ADD_TESTS(ed25519 LINK_LIBRARIES mysys ref10) + MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl) ENDIF() -- cgit v1.2.1 From 724aefa56d5837e8ecaacd87477f4ebe00601b0f Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 3 Jun 2019 13:52:33 +0200 Subject: Fix linking error, for GNU linker. --- plugin/auth_ed25519/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index 8ed50e8fec9..ff6651c528d 100644 --- a/plugin/auth_ed25519/CMakeLists.txt +++ b/plugin/auth_ed25519/CMakeLists.txt @@ -25,7 +25,7 @@ MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY) # client plugin and unit test ed25519-t can use the library MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY - CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) + CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins) IF(WITH_UNIT_TESTS) MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl) -- cgit v1.2.1