diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-13 18:36:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-13 18:36:09 +0300 |
| commit | 984d7100cdab91fb23d97c05e8b6329a90fe1583 (patch) | |
| tree | db323b31d44e10079fadf9de048972745cd89070 /plugin | |
| parent | d46db415cef910c65b0e550a9d00fe188cfd8910 (diff) | |
| parent | 8e3a4be45c551883d37e5598f0b4108ccf31521c (diff) | |
| download | mariadb-git-984d7100cdab91fb23d97c05e8b6329a90fe1583.tar.gz | |
Merge 10.4 into 10.5
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 ffd2523d1af..1a3d5cc4bce 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() |