diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
| commit | b42dbdbccd3b939394ca9b608ad91a04235e95f1 (patch) | |
| tree | e969f314963faa202fdb6f87d5aca67810844742 /plugin | |
| parent | 490dcfd5d74ce45cbdd6105e4295116f6a944e2b (diff) | |
| parent | cbac8f935182ecc5bb907de3ae48942467f0b8ba (diff) | |
| download | mariadb-git-b42dbdbccd3b939394ca9b608ad91a04235e95f1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_ed25519/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index 73d8eeb208b..ff6651c528d 100644 --- a/plugin/auth_ed25519/CMakeLists.txt +++ b/plugin/auth_ed25519/CMakeLists.txt @@ -25,8 +25,8 @@ 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 mysys ref10) + MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl) ENDIF() |